laolan

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

@@ -29,6 +29,7 @@ class RegAPI extends APIBase {
                 opResult = await this.regCenterOrderSve.submitRegNeed(pobj, pobj.actionBody);
                 break;
             case "regFeedbackSubmit"://接收方案反馈信息
+                pobj.actionType = "regFeedbackSubmit";
                 opResult = await this.regCenterOrderSve.regFeedbackSubmit(pobj);
                 break;
             case "regOrderStatus"://reg方案更新

center-channel/app/base/api/impl/ic/regCfg.js

@@ -90,7 +90,7 @@ var  regCfg = {
         "石家庄":"130100"
       },
       channelTypeCode : {
-        "GSREG" : "baidu.gszc",
+        "GSREG" : "baidu.gsreg",
         "KZFW" : "baidu.kzfw",
         "GSCHANGS" : "baidu.gsbg",
         "GSNB" : "baidu.gsnb",

center-channel/app/base/service/impl/common/regCenterOrderSve.js

@@ -166,19 +166,19 @@ async regPaySuccess(pobj) {
   }
   return system.getResultSuccess();
 }
-  // /**
-  //   * 获取方案详情
-  //   * @param {*} pobj
-  //   * @param {*} actionBody bizId 渠道方案号
-  //   */
-  //  async getSolutionByChannelOrderNo(pobj, actionBody) {
-  //   if (!actionBody.orderNo) {
-  //     return system.getResult(null, "actionBody.orderNo can not be empty，100390");
-  //   }
-  //   var reqUrl = this.centerOrderUrl + "action/need/springBoard";
-  //   var itemResult = await this.restPostUrl(pobj, reqUrl);
-  //   return itemResult;
-  // }
+  /**
+    * 获取方案详情
+    * @param {*} pobj
+    * @param {*} actionBody bizId 渠道方案号
+    */
+   async getSolutionByChannelOrderNo(pobj, actionBody) {
+    if (!actionBody.orderNo) {
+      return system.getResult(null, "actionBody.orderNo can not be empty，100390");
+    }
+    var reqUrl = this.centerOrderUrl + "action/need/springBoard";
+    var itemResult = await this.restPostUrl(pobj, reqUrl);
+    return itemResult;
+  }
 
   /**
   * 获取需求详情
@@ -528,28 +528,30 @@ async regFeedbackSubmit(pobj, reqUrl) {
   async regUpdateOrderStatus(pobj) {
     var res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard");
     console.log('推送交付信息/修改订单状态res+++++',res)
-    console.log('推送交付信息/修改订单状态baidu++pobj+++',pobj)
+    console.log('推送交付信息/修改订单状态++pobj+++',pobj)
+   
     if (res && res.status == 0 && res.data) {
-      var needsolution = res.data;//方案信息
-      var deliverContent = {
-        applicationFormUrl:"",//公司注册申请登记表文件
-        registDocumentsUrl:"",//注册文件
-        baseInfo:res.data.solution,//基本信息
-        companyInfo:""//公司信息
+      var  deliverContent
+      if( pobj.actionBody.deliverContent){
+        deliverContent = {
+          applicationFormUrl:pobj.actionBody.deliverContent.applicationFormUrl || "",//公司注册申请登记表文件
+          registDocumentsUrl:pobj.actionBody.deliverContent.registDocumentsUrl || "",//注册文件
+          baseInfo:pobj.actionBody.deliverContent.baseInfo || {},//基本信息
+          companyInfo:pobj.actionBody.deliverContent.companyInfo || {}//公司信息
+        }
       }
       if(res.data.uapp_id == regCfg.uappId.baidu){
         //推送数据至百度 
-        var BizId = needsolution.orderChannelNo;
-        console.log('BizId++',BizId)
         var pushObj = {
           orderNo:res.data.bizId,
-          status :res.data.status,
+          status :res.data.deliveryContent.status,
           deliverContent :deliverContent
         };
         var self = this;
         //推送交付信息/修改订单状态
         var baidu = await self.baiduRegClient.baiduReqbyget({ path: "/v1/provider/comreg", reqbody: pushObj });
         console.log('推送交付信息/修改订单状态baidu+++',baidu)
+        console.log('推送交付信息/修改订单状态pushObj+++',pushObj)
       }
       console.log('rsrsr++++------------++++',res)
       return res

center-channel/app/config/businessConfig.js

@@ -19,8 +19,9 @@ module.exports = {
             "getParamsFor360", "addOrderWeb", "getPayRecords", "getLoginInfo", "putUserMobileByVcode",
             "putUserPwdByMobile", "icpNotifyNew",
             //百度工商注册
-            "regGetInfoByChannelNeedNo","submitRegNeed","regFeedbackSubmit","regOrderStatus","regOrderClose","getSolutionByChannelOrderNo",
-            "regSubmitSolution","regWriteCommunicationLog","regQueryExpertCommunicationLogs","regUpdateOrderStatus","regNeedClose","regPaySuccess"
+            "regGetInfoByChannelNeedNo","submitRegNeed","regFeedbackSubmit","regOrderStatus","regOrderClose",
+            "getSolutionByChannelOrderNo","getItemByChannelSolutionNo","regSubmitSolution","regNeedClose",
+            "regWriteCommunicationLog","regQueryExpertCommunicationLogs","regUpdateOrderStatus","regPaySuccess"
         ],
         apiMustUserpinList: [
             "icpOrderClose",
@@ -29,8 +30,9 @@ module.exports = {
             "ncSubmitMaterial","ncNotification","ncSubmitSolution","ncCloseNeed","ncClosePlan",
             "rtSubmitMaterial","rtNotification","rtSubmitSolution","rtCloseNeed","rtClosePlan",
             //百度工商注册
-            "regGetInfoByChannelNeedNo","submitRegNeed","regFeedbackSubmit","regOrderStatus","regOrderClose","getSolutionByChannelOrderNo",
-            "regSubmitSolution","regWriteCommunicationLog","regQueryExpertCommunicationLogs","regUpdateOrderStatus","regNeedClose","regPaySuccess"
+            "regGetInfoByChannelNeedNo","submitRegNeed","regFeedbackSubmit","regOrderStatus","regOrderClose",
+            "getSolutionByChannelOrderNo","getItemByChannelSolutionNo","regSubmitSolution","regNeedClose",
+            "regWriteCommunicationLog","regQueryExpertCommunicationLogs","regUpdateOrderStatus","regPaySuccess"
         ],
         apiSecretPathList: [
             "/api/icp/consultation/submit",