Merge branch 'tx-fi-tax' of gitlab.gongsibao.com:jiangyong/zhichan into tx-fi-tax

tx-fi-tax/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -16,6 +16,7 @@ class DeliverybillCtl extends CtlBase {
     this.logService = system.getObject("service.bizchance.statuslogSve");
     this.cacheManager = system.getObject("db.common.cacheManager");
     this.fitaxschemeService = system.getObject("service.bizchance.fitaxschemeSve");
+    this.bizoptService =  system.getObject("service.bizchance.bizoptSve");
   }
 
   /**
@@ -194,7 +195,20 @@ class DeliverybillCtl extends CtlBase {
           obj.scheme_number = pobj.solutionBizId;
           var scheme = await this.fitaxschemeService.findInfoByBizid({ "bizId": pobj.solutionBizId });
           if (scheme) {
-            pobj.demand_code = scheme.demand_code;
+            obj.demand_code = scheme.demand_code;
+            //根据需求编号获取业务员信息
+            var bizopt = await this.bizoptService.findInfoByDemandCode({ "demand_code": obj.demand_code });
+            if (bizopt){
+              obj.salesman_opcode = bizopt.salesman_opcode;
+              obj.salesman_id = bizopt.salesman_id;
+              obj.salesman_name = bizopt.salesman_name;
+              obj.salesman_phone = bizopt.salesman_phone;
+              obj.delivery_man_opcode = bizopt.salesman_opcode;
+              obj.delivery_man_id = bizopt.salesman_id;
+              obj.delivery_man_name = bizopt.salesman_name;
+              
+            }
+
           }
         }
         obj.product_code = "bookkeeping";

tx-fi-tax/app/base/system.js

@@ -388,7 +388,8 @@ class System {
 						pushUrl: obj.pushUrl,
 						actionType: obj.actionType,
 						identifyCode: "book-manage",
-						messageBody: obj.messageBody
+						messageBody: obj.messageBody,
+						isMessageBody:1//对融易算只发送放messageBody
 					}
 				}
 				if (obj.notifyUrl) {