fix: 将服务商id与业务员信息拆分返回

center-manage/app/base/service/impl/auth/userSve.js

@@ -452,16 +452,16 @@ class UserService extends ServiceBase {
             compId: companyFind.id
             compId: companyFind.id
           }
           }
           await self.cacheManager["ClientBindBizUserCache"].cache(clientMobile, tmp)
           await self.cacheManager["ClientBindBizUserCache"].cache(clientMobile, tmp)
-          return tmp
+          return {userInfo: tmp, comInfo: {compId: tmp.compId}};
         } else {
         } else {
-          return null
+          return {userInfo: null, comInfo: {compId: tmp.compId}};
         }
         }
 
 
       } else {
       } else {
         if (resultcache) {//不继续，直接返回缓存
         if (resultcache) {//不继续，直接返回缓存
-          return resultcache
+          return {userInfo: resultcache.tmp, comInfo: {compId: companyFind.id}};
         } else {
         } else {
-          return null
+          return {userInfo: null, comInfo: {compId: companyFind.id}};
         }
         }
       }
       }
 
 
@@ -557,17 +557,17 @@ class UserService extends ServiceBase {
             compId: companyFind.id
             compId: companyFind.id
           }
           }
           await self.cacheManager["ClientBindBizUserCache"].cache(clientMobile, tmp)
           await self.cacheManager["ClientBindBizUserCache"].cache(clientMobile, tmp)
-          return tmp
+          return {userInfo: tmp, comInfo: {cost: tmp.cost, compId: tmp.compId}};
         } else {
         } else {
-          return null
+          return {userInfo: null, comInfo: {cost: tmp.cost, compId: tmp.compId}};
         }
         }
 
 
       } else {
       } else {
         if (resultcache) {//不继续，直接返回缓存
         if (resultcache) {//不继续，直接返回缓存
           resultcache["cost"] = costAmount
           resultcache["cost"] = costAmount
-          return resultcache
+          return {userInfo: resultcache.tmp, comInfo: {cost: costAmount, compId: companyFind.id}};
         } else {
         } else {
-          return null
+          return {userInfo: null, comInfo: {cost: costAmount, compId: companyFind.id}};
         }
         }
       }
       }
     })
     })

center-manage/app/base/service/impl/common/channelhandlers/tx.js

@@ -56,12 +56,14 @@ class TxHandler {
         if (datajson.actionBody.UserName && datajson.actionBody.UserName != 'undefined') {
         if (datajson.actionBody.UserName && datajson.actionBody.UserName != 'undefined') {
           params.UserName = datajson.actionBody.UserName;
           params.UserName = datajson.actionBody.UserName;
         }
         }
-        if (salesmanInfo && salesmanInfo != 'undefined') {
-          params.salesmanOpcode = salesmanInfo.opath;
-          params.salesmanId = salesmanInfo.userId;
-          params.clerkName = salesmanInfo.userName;
-          params.clerkPhone = system.encryptStr(salesmanInfo.mobile);
-          params.servicerCode = salesmanInfo.compId
+        if(salesmanInfo.comInfo) {
+          params.servicerCode = salesmanInfo.comInfo.compId
+        }
+        if (salesmanInfo.userInfo && salesmanInfo.userInfo != 'undefined') {
+          params.salesmanOpcode = salesmanInfo.userInfo.opath;
+          params.salesmanId = salesmanInfo.userInfo.userId;
+          params.clerkName = salesmanInfo.userInfo.userName;
+          params.clerkPhone = system.encryptStr(salesmanInfo.userInfo.mobile);
         }
         }
         var rtn = await rc.execPost3({ "d": params }, requrl);
         var rtn = await rc.execPost3({ "d": params }, requrl);
         var j = JSON.parse(rtn.stdout);
         var j = JSON.parse(rtn.stdout);
@@ -241,15 +243,17 @@ class TxHandler {
             "regInfo": {},
             "regInfo": {},
             "express_info": {}
             "express_info": {}
           }
           }
-          if (salesmanInfo && salesmanInfo != 'undefined') {
-            params.clerkOpcode = salesmanInfo.opath;
-            params.clerkId = salesmanInfo.userId;
-            params.clerkName = salesmanInfo.userName;
-            //params.clerkPhone = salesmanInfo.mobile;
-            params.costPrice = salesmanInfo.cost;
-            params.servicerCode = salesmanInfo.compId;
-            params.baseInfo.clerkName = salesmanInfo.userName;
-          //  params.baseInfo.clerkPhone = salesmanInfo.mobile
+          if(salesmanInfo.comInfo) {
+            params.costPrice = salesmanInfo.comInfo.cost;
+            params.servicerCode = salesmanInfo.comInfo.compId;
+          }
+          if (salesmanInfo.userInfo && salesmanInfo.userInfo != 'undefined') {
+            params.clerkOpcode = salesmanInfo.userInfo.opath;
+            params.clerkId = salesmanInfo.userInfo.userId;
+            params.clerkName = salesmanInfo.userInfo.userName;
+            //params.clerkPhone = salesmanInfo.userInfo.mobile;
+            params.baseInfo.clerkName = salesmanInfo.userInfo.userName;
+          //  params.baseInfo.clerkPhone = salesmanInfo.userInfo.mobile
           }
           }
           // if (!params.servicerCode || params.servicerCode == 'undefined') {
           // if (!params.servicerCode || params.servicerCode == 'undefined') {
           //   if (datajson.actionBody.orderSnapshot.servicerCode && datajson.actionBody.orderSnapshot.servicerCode != 'undefined') {
           //   if (datajson.actionBody.orderSnapshot.servicerCode && datajson.actionBody.orderSnapshot.servicerCode != 'undefined') {