虚拟机提交代码Windows获取（百度套餐）

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

@@ -109,7 +109,8 @@ var  regCfg = {
         'COLLECTING': 'COLLECTING',//材料收集环节
         'AUDITING': 'AUDITING',//工商审核环节
         'ENGRAVING': 'ENGRAVING',//刻章环节
-        'SUCCESS': 'SUCCESS' //已完成
+        'SUCCESS': 'SUCCESS', //已完成
+        'ACTIVE': 'ACTIVE' //服务中
     },
      //交付状态
      deliverStatus:{
@@ -117,7 +118,8 @@ var  regCfg = {
         'COLLECTING': '材料收集环节',//
         'AUDITING': '工商审核环节',//
         'ENGRAVING': '刻章环节',//
-        'SUCCESS': '已完成' //
+        'SUCCESS': '已完成', //
+        'ACTIVE': '服务中' //
     },
     //返回结果配置
     getUUID() {

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

@@ -384,18 +384,19 @@ class RegCenterOrderService extends AppServiceBase {
         console.log('reg ---  pobj -----', pobj)
         var s
         var subSnLength
+        var res
         if (pobj.actionBody.solutionList) {
             subSnLength = pobj.actionBody.solutionList.length
             for (s = 0; s < subSnLength; s++) {
                 if (!pobj.actionBody.solutionList[s].solutionContent.solution.channelSolutionNo) {
-                    var res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard");
+                    res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard");
                 } else {
                     pobj.actionType = "updateSolution"
-                    var res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard");
+                    res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard");
                 }
             }
         }
-
+        console.log('reg -----res -----', res)
         if (res && res.status == 0 && res.data && res.data.needinfo && res.data.needsolutions) {
             console.log('reg ---  res -----', res)
             var needinfo = res.data.needinfo;//需求信息
@@ -556,9 +557,9 @@ class RegCenterOrderService extends AppServiceBase {
         var res = await this.reqCenterOrderApi(pobj, "action/regapi/springBoard");
         console.log('推送交付信息/修改订单状态res+++++', res)
         console.log('推送交付信息/修改订单状态++pobj+++', pobj)
-
+        var deliverContent = {}
+        var pushObj = {}
         if (res && res.status == 0 && res.data) {
-            var deliverContent
             if (pobj.actionBody.deliverContent) {
                 if (pobj.actionBody.deliverContent.companyInfo && pobj.actionBody.deliverContent.companyInfo.serviceArea) {
                     pobj.actionBody.deliverContent.companyInfo.serviceArea = regCfg.baiduAreaCode[pobj.actionBody.deliverContent.companyInfo.serviceArea]
@@ -571,12 +572,49 @@ class RegCenterOrderService extends AppServiceBase {
                 }
             }
             if (res.data.uapp_id == regCfg.uappId.baidu) {
-                //推送数据至百度
-                var pushObj = {
-                    orderNo: res.data.bizId,
-                    status: res.data.deliveryContent.status,
-                    deliverContent: deliverContent
-                };
+               //2021-5-18新增套餐公司注册与正常公司注册区分
+               if(pobj.actionBody.consultType && pobj.actionBody.consultType == "GSREG" ){
+                    //推送正常公司注册数据至百度
+                    pushObj = {
+                        orderNo: res.data.bizId,
+                        status: res.data.deliveryContent.status,
+                        deliverContent: deliverContent
+                    };
+               }
+               if(pobj.actionBody.consultType && pobj.actionBody.consultType == "QYJYTC1"){
+                    //推送套餐1公司注册数据至百度
+                    pushObj = {
+                        orderNo: res.data.bizId,
+                        status: res.data.deliveryContent.status,
+                        deliverContent: deliverContent,
+                        consultType:pobj.actionBody.consultType,    //需求类型： GSREG：正常原始公司注册； QYJYTC1：企业经营套餐1； QYJYTC2：企业经营套餐2；
+                        productType:pobj.actionBody.productType    //套餐包含业的务类型： 不传为原始公司注册
+                    };
+               }
+               if(pobj.actionBody.consultType && pobj.actionBody.consultType == "QYJYTC2"){
+                    //推送套餐2公司注册数据至百度
+                    //代理记账和地址服务需要单独的开始和结束时间
+                    //地址服务:时间截止到天,  代理记账:时间截止到月,    时间字段都是秒
+                    if(pobj.actionBody.productType == "DLJZ" || pobj.actionBody.productType == "DZFW"){
+                        pushObj = {
+                            orderNo: res.data.bizId,
+                            status: res.data.deliveryContent.status,
+                            deliverContent: deliverContent,
+                            consultType:pobj.actionBody.consultType,    //需求类型： GSREG：正常原始公司注册； QYJYTC1：企业经营套餐1； QYJYTC2：企业经营套餐2；
+                            productType:pobj.actionBody.productType,    //套餐包含业的务类型： 不传为原始公司注册
+                            startTime:pobj.actionBody.startTime,        //开始时间
+                            endTime:pobj.actionBody.endTime             //结束时间
+                        };
+                    }else{
+                        pushObj = {
+                            orderNo: res.data.bizId,
+                            status: res.data.deliveryContent.status,
+                            deliverContent: deliverContent,
+                            consultType:pobj.actionBody.consultType,    //需求类型： GSREG：正常原始公司注册； QYJYTC1：企业经营套餐1； QYJYTC2：企业经营套餐2；
+                            productType:pobj.actionBody.productType    //套餐包含业的务类型： 不传为原始公司注册
+                        };
+                    }
+                }
                 var self = this;
                 //推送交付信息/修改订单状态
                 var baidu = await self.baiduRegClient.baiduReqbyget({path: "/v1/provider/comreg", reqbody: pushObj});