Commit f05629a6 by Sxy

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

parents fe7ebe5b 849c0f22
...@@ -16,6 +16,7 @@ class DeliverybillCtl extends CtlBase { ...@@ -16,6 +16,7 @@ class DeliverybillCtl extends CtlBase {
this.logService = system.getObject("service.bizchance.statuslogSve"); this.logService = system.getObject("service.bizchance.statuslogSve");
this.cacheManager = system.getObject("db.common.cacheManager"); this.cacheManager = system.getObject("db.common.cacheManager");
this.fitaxschemeService = system.getObject("service.bizchance.fitaxschemeSve"); this.fitaxschemeService = system.getObject("service.bizchance.fitaxschemeSve");
this.bizoptService = system.getObject("service.bizchance.bizoptSve");
} }
/** /**
...@@ -194,7 +195,20 @@ class DeliverybillCtl extends CtlBase { ...@@ -194,7 +195,20 @@ class DeliverybillCtl extends CtlBase {
obj.scheme_number = pobj.solutionBizId; obj.scheme_number = pobj.solutionBizId;
var scheme = await this.fitaxschemeService.findInfoByBizid({ "bizId": pobj.solutionBizId }); var scheme = await this.fitaxschemeService.findInfoByBizid({ "bizId": pobj.solutionBizId });
if (scheme) { 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"; obj.product_code = "bookkeeping";
......
...@@ -388,7 +388,8 @@ class System { ...@@ -388,7 +388,8 @@ class System {
pushUrl: obj.pushUrl, pushUrl: obj.pushUrl,
actionType: obj.actionType, actionType: obj.actionType,
identifyCode: "book-manage", identifyCode: "book-manage",
messageBody: obj.messageBody messageBody: obj.messageBody,
isMessageBody:1//对融易算只发送放messageBody
} }
} }
if (obj.notifyUrl) { if (obj.notifyUrl) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment