pp

center-manage/app/base/service/impl/common/channelSve.js

@@ -22,7 +22,7 @@ class ChannelService extends ServiceBase {
     if (!this.handlers[fileName][method]) {
     if (!this.handlers[fileName][method]) {
       throw Error(`请在${fileName}文件中定义渠道流量的处理方法${method}`)
       throw Error(`请在${fileName}文件中定义渠道流量的处理方法${method}`)
     }
     }
-    let rtn = await this.handlers[fileName][method](datajson);
+    let rtn = await this.handlers[fileName][method](datajson, channelobj);
     return rtn;
     return rtn;
   }
   }
   async create(p, q, req) {
   async create(p, q, req) {

center-manage/app/base/service/impl/common/channelhandlers/ali.js → center-manage/app/base/service/impl/common/channelhandlers/aliCloud.js

@@ -175,7 +175,7 @@ class AliHandler {
   }
   }
 
 
   //交付单处理
   //交付单处理
-  async pushOrderDelivery(datajson) {
+  async pushOrderDelivery(datajson, channelobj) {
     console.log("put in queue-----------------------------------------------------------------------------------------------------", datajson);
     console.log("put in queue-----------------------------------------------------------------------------------------------------", datajson);
     try {
     try {
       console.log("交付单数据:" + JSON.stringify(datajson));
       console.log("交付单数据:" + JSON.stringify(datajson));
@@ -212,6 +212,10 @@ class AliHandler {
         }
         }
         else {
         else {
           let obj = await this.actionBodyHandler(datajson.actionBody);
           let obj = await this.actionBodyHandler(datajson.actionBody);
+          //渠道名称和渠道编码
+
+          obj.channelSource = channelobj.name;
+          obj.channelNumber = channelobj.code;
           //分配业务员
           //分配业务员
           if (datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId) {
           if (datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId) {
             //去数据库查询该业务员信息
             //去数据库查询该业务员信息
@@ -219,9 +223,9 @@ class AliHandler {
               let resInfo = await this.userService.getSalesmanInfo(datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId);
               let resInfo = await this.userService.getSalesmanInfo(datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId);
               obj.salesmanOpcode = resInfo.opath;
               obj.salesmanOpcode = resInfo.opath;
               obj.salesmanName = resInfo.nickName;
               obj.salesmanName = resInfo.nickName;
-              obj.servicerCode=resInfo.company_id;
+              obj.servicerCode = resInfo.company_id;
             } catch (error) {
             } catch (error) {
-              console.log("salesmanChannelId: "+ datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId +"获取业务员opcode失败:" + error)
+              console.log("salesmanChannelId: " + datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId + "获取业务员opcode失败:" + error)
             }
             }
           }
           }
 
 
@@ -419,18 +423,14 @@ class AliHandler {
       obj.sellingPrice = data.needsolution.totalSum;
       obj.sellingPrice = data.needsolution.totalSum;
     }
     }
 
 
-    //渠道名称和渠道编码
-    obj.channelSource = "aliCloud";
-    obj.channelNumber = "阿里云";
-
-    if(data.needsolution.salesmanInfo) {//业务员id
-      if(data.needsolution.salesmanInfo.salesmanId) {
+    if (data.needsolution.salesmanInfo) {//业务员id
+      if (data.needsolution.salesmanInfo.salesmanId) {
         obj.salesmanId = data.needsolution.salesmanInfo.salesmanId;
         obj.salesmanId = data.needsolution.salesmanInfo.salesmanId;
       }
       }
-      if(data.needsolution.salesmanInfo.salesmanName) {//业务员name
+      if (data.needsolution.salesmanInfo.salesmanName) {//业务员name
         obj.salesmanName = data.needsolution.salesmanInfo.salesmanName;
         obj.salesmanName = data.needsolution.salesmanInfo.salesmanName;
       }
       }
-      if(data.needsolution.salesmanInfo.salesmanMobile) {//业务员手机
+      if (data.needsolution.salesmanInfo.salesmanMobile) {//业务员手机
         obj.salesmanPhone = data.needsolution.salesmanInfo.salesmanMobile;
         obj.salesmanPhone = data.needsolution.salesmanInfo.salesmanMobile;
       }
       }
     }
     }