add 工商注册

ic-deliver/app/base/controller/impl/bizchance/bizoptCtl.js

@@ -30,7 +30,7 @@ class BizOptCtl extends CtlBase {
         delete pobj.search.dateType
         delete pobj.search.dateType
       }
       }
       if (pobj.search && pobj.search.sourceName) {
       if (pobj.search && pobj.search.sourceName) {
-        pobj.search.source_name=pobj.search.sourceName
+        pobj.search.source_name = pobj.search.sourceName
         delete pobj.search.sourceName
         delete pobj.search.sourceName
       }
       }
       const rs = await this.service.findAndCountAll(pobj);
       const rs = await this.service.findAndCountAll(pobj);
@@ -261,7 +261,7 @@ class BizOptCtl extends CtlBase {
           //pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
           //pobj.currentStatus = "beforeSubmission";//加上当前状态为待提交方案
           // pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
           // pobj.channelSource = "tencentCloud";//目前渠道只有腾讯
           // pobj.sourceNumber = "1111111";
           // pobj.sourceNumber = "1111111";
-          pobj.businessType = appconfig.pdict.dyDict[pobj.businessType];
+          pobj.businessType = appconfig.pdict.dyDict[pobj.businessType] || pobj.businessType;
           var buInfo = await this.service.insertInfo(pobj);
           var buInfo = await this.service.insertInfo(pobj);
           var logInfo = {
           var logInfo = {
             "flowType": "BIZ",
             "flowType": "BIZ",

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -574,7 +574,7 @@ class DeliverybillCtl extends CtlBase {
           var sInfo = {
           var sInfo = {
             "flowType": "DELIVERY",
             "flowType": "DELIVERY",
             "flowId": res.id,
             "flowId": res.id,
-            "flowCode": pobj.deliverNumber,
+            "flowCode": res.master_source_number || pobj.deliverNumber,
             "salesmanInfo": {
             "salesmanInfo": {
               //"oldClerkPhone": res.salesman_phone,
               //"oldClerkPhone": res.salesman_phone,
               "oldFacilitatorId": res.facilitator_id,
               "oldFacilitatorId": res.facilitator_id,
@@ -605,7 +605,10 @@ class DeliverybillCtl extends CtlBase {
             }
             }
           }
           }
           await this.shisService.insertInfo(sInfo);//之前业务员转历史
           await this.shisService.insertInfo(sInfo);//之前业务员转历史
-          await this.service.updateSalesmanInfoByDeliverCode(pobj);//更新业务员信息
+          await this.service.updateSalesmanInfoByDeliverCode({
+            ...pobj,
+            master_source_number: res.master_source_number
+          });//更新业务员信息
           return system.getResult("操作成功！");
           return system.getResult("操作成功！");
         }
         }
         else {
         else {

ic-deliver/app/base/db/impl/bizchance/deliverybillDao.js

@@ -128,6 +128,11 @@ class DeliverybillDao extends Dao {
       setobj.facilitator_name = qobj.facilitatorName;
       setobj.facilitator_name = qobj.facilitatorName;
     };
     };
     var whereobj = { "delivery_code": qobj.deliverNumber };
     var whereobj = { "delivery_code": qobj.deliverNumber };
+    if (qobj.master_source_number) {
+      whereobj = {
+        master_source_number: qobj.master_source_number
+      }
+    }
     return await this.updateByWhere(setobj, whereobj, t);
     return await this.updateByWhere(setobj, whereobj, t);
   }
   }