增加返回值

center-order/app/base/api/impl/action/regapi.js

@@ -40,7 +40,7 @@ class RegAPI extends APIBase {
             case "regOrderClose"://关闭订单
             case "regOrderClose"://关闭订单
                 opResult = await this.regCenterOrderSve.regOrderClose(pobj);
                 opResult = await this.regCenterOrderSve.regOrderClose(pobj);
                 break;
                 break;
-                
+
             case "regFeedbackSubmit"://接收需求反馈 百度reg 2.2
             case "regFeedbackSubmit"://接收需求反馈 百度reg 2.2
                 opResult = await this.regCenterOrderSve.regFeedbackSubmit(pobj);
                 opResult = await this.regCenterOrderSve.regFeedbackSubmit(pobj);
                 break;
                 break;
@@ -65,7 +65,7 @@ class RegAPI extends APIBase {
             case "updateSolution"://方案更新
             case "updateSolution"://方案更新
                 opResult = await this.regCenterOrderSve.updateSolution(pobj);
                 opResult = await this.regCenterOrderSve.updateSolution(pobj);
                 break;
                 break;
-                
+
             case "regWriteCommunicationLog"://新增沟通记录
             case "regWriteCommunicationLog"://新增沟通记录
                 opResult = await this.regCenterOrderSve.regWriteCommunicationLog(pobj);
                 opResult = await this.regCenterOrderSve.regWriteCommunicationLog(pobj);
                 break;
                 break;
@@ -81,7 +81,7 @@ class RegAPI extends APIBase {
             case "saveReginfo"://保存渠道方案及url
             case "saveReginfo"://保存渠道方案及url
                 opResult = await this.regCenterOrderSve.saveReginfo(pobj);
                 opResult = await this.regCenterOrderSve.saveReginfo(pobj);
                 break;
                 break;
-                
+
             case "getRegInfoByChannelNeedNo"://获取需求方案列表
             case "getRegInfoByChannelNeedNo"://获取需求方案列表
                 opResult = await this.regCenterOrderSve.reqCenterOrderApi(pobj);
                 opResult = await this.regCenterOrderSve.reqCenterOrderApi(pobj);
                 break;
                 break;
@@ -92,4 +92,7 @@ class RegAPI extends APIBase {
         return opResult;
         return opResult;
     }
     }
 }
 }
-module.exports = RegAPI;
+module.exports = RegAPI;
\ No newline at end of file
+
+// let tmptest=new RegAPI()
+// tmptest.springBoard({"actionType":"regUpdateOrderStatus","actionBody":{"orderNo":"OT44202105311300t5eQ","consultType":"GSREG","status":703,"deliverContent":{"applicationFormUrl":"https://gsb-zc.oss-cn-beijing.aliyuncs.com/zc_452164696435020820221110550208.pdf","baseInfo":{},"companyInfo":{"companyName":"北京半山半水文化咨询有限公司","spareName":[],"serviceArea":""}}},"appInfo":{"id":21,"app_hosts":"alitm.qifu.gongsibao.com","app_code":"alitm","app_name":"阿里云商标服务","uapp_id":"36","uapp_key":"202003231118","uapp_secret":"7cbb846246874167b5c7e01cd0016c99","contact_name":"宋毅","contact_mobile":"15010929366","contact_email":null,"desc":"阿里云商标服务","is_enabled":1,"is_sign":0,"pay_type":"00","delivery_type":"10","created_at":"2020-03-23T11:24:10.000Z","updated_at":"2020-03-23T11:24:11.000Z","version":0},"actionProcess":"alitm","userInfo":{"id":15890,"uapp_id":36,"channel_userid":"jytest6","channel_username":"jytest6","channel_nickname":"","open_id":"","head_url":"","mobile":"jytest6","org_name":"","org_path":"","email":"","is_admin":0,"is_super":0,"is_enabled":1,"userpin":"1466e1f9cdf1463f908ddeb53b035768"}})
\ No newline at end of file

center-order/app/base/service/impl/qcutils/regCenterOrderSve.js

@@ -27,7 +27,7 @@ class RegCenterOrderService {
       'COLLECTING': 702,  //材料收集环节
       'COLLECTING': 702,  //材料收集环节
       'AUDITING': 703,    //工商审核环节
       'AUDITING': 703,    //工商审核环节
       'ENGRAVING': 704,   //刻章环节
       'ENGRAVING': 704,   //刻章环节
-      'SUCCESS': 705,      //已完成 
+      'SUCCESS': 705,      //已完成
       'ACTIVE': 706        //服务中
       'ACTIVE': 706        //服务中
     }
     }
 
 
@@ -36,7 +36,7 @@ class RegCenterOrderService {
       702: 'COLLECTING',  //材料收集环节
       702: 'COLLECTING',  //材料收集环节
       703: 'AUDITING',    //工商审核环节
       703: 'AUDITING',    //工商审核环节
       704: 'ENGRAVING',   //刻章环节
       704: 'ENGRAVING',   //刻章环节
-      705: 'SUCCESS',      //已完成 
+      705: 'SUCCESS',      //已完成
       706: 'ACTIVE'         //服务中
       706: 'ACTIVE'         //服务中
     }
     }
 
 
@@ -50,7 +50,7 @@ class RegCenterOrderService {
     }
     }
   }
   }
 
 
-  // 获取需求详情 
+  // 获取需求详情
   async selectNeedInfo(pobj) {
   async selectNeedInfo(pobj) {
     pobj.actionType = "selectNeedInfo"
     pobj.actionType = "selectNeedInfo"
     var needinfo = {}
     var needinfo = {}
@@ -1075,7 +1075,7 @@ class RegCenterOrderService {
     // ab["bizId"] = ns.channelSolutionNo;
     // ab["bizId"] = ns.channelSolutionNo;
     ab["solutionNo"] = ns.solutionNo;
     ab["solutionNo"] = ns.solutionNo;
     pobj.actionBody = ab;
     pobj.actionBody = ab;
-    return this.regAcceptPartnerNotification(pobj);
+    return await this.regAcceptPartnerNotification(pobj);
   }
   }
   //服务商通知状态变更
   //服务商通知状态变更
   async regAcceptPartnerNotification(pobj) {
   async regAcceptPartnerNotification(pobj) {
@@ -1570,6 +1570,7 @@ class RegCenterOrderService {
       }
       }
     }
     }
     deliveryContent = JSON.stringify(deliveryContent);
     deliveryContent = JSON.stringify(deliveryContent);
+    deliveryContent=deliveryContent.replace("\\n","")
     let orderdeliveryData = {
     let orderdeliveryData = {
       sourceOrderNo: ab.orderNo,
       sourceOrderNo: ab.orderNo,
       deliveryContent: deliveryContent,
       deliveryContent: deliveryContent,