fix: redis缓存

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

@@ -67,7 +67,7 @@ class AliHandler {
         var j = JSON.parse(rtn.stdout);
         console.log(JSON.stringify(j), "RRRRRRRRRRRRRRR");
         if (j.status == 1) {
-          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入redis缓存
+          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存
         }
         return j;
       }
@@ -122,7 +122,7 @@ class AliHandler {
         var j = JSON.parse(rtn.stdout);
         if (j.status == 0) {
           j.status = 1;
-          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入redis缓存
+          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存
         }
         return j
       }
@@ -193,7 +193,7 @@ class AliHandler {
         var rtn = await rc.execPost3(params, requrl);
         var j = JSON.parse(rtn.stdout);
         if (j.status == 0) {
-          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入缓存
+          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入缓存
 
           //给业务员发信息
           var selUrl = this.icUrl + "/schemeCtl/findInfoByDemandCode";
@@ -288,6 +288,7 @@ class AliHandler {
       if (datajson.actionBody.needsolution.status && (datajson.actionBody.needsolution.status == "PAID" || datajson.actionBody.needsolution.status == "USER_PAY_PRODUCE")) {
         //查询业务员信息并填充到obj
         if (datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId) {
+          obj.salesmanOpcode = `root10/bizgroup01/g1members/${datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId}`;
           //去数据库查询该业务员信息
           try {
             let resInfo = await this.userService.getSalesmanInfo(datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId);
@@ -358,7 +359,7 @@ class AliHandler {
       console.log("pushOrderDelivery插入数据成功---------------------------------" + rtn.stdout);
       var j = JSON.parse(rtn.stdout);
       if (j.status == 0) {
-        await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);
+        await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);
         j.status = 1;
       }
       return j
@@ -410,7 +411,7 @@ class AliHandler {
         var rtn = await rc.execPost3(params, requrl);
         var j = JSON.parse(rtn.stdout);
         if (j.status == 0) {
-          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入缓存
+          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入缓存
           return {
             "status": 1,    //1代表成功，否则失败
             "msg": "",

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

@@ -70,7 +70,7 @@ class BaiduHandler {
         var j = JSON.parse(rtn.stdout);
         console.log(JSON.stringify(j), "RRRRRRRRRRRRRRR");
         if (j.status == 1) {
-          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入redis缓存
+          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存
         }
         return j;
       }
@@ -124,7 +124,7 @@ class BaiduHandler {
         var j = JSON.parse(rtn.stdout);
         if (j.status == 0) {
           j.status = 1;
-          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入redis缓存
+          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存
         }
         return j
       }
@@ -158,10 +158,11 @@ class BaiduHandler {
       obj.channelNumber = channelobj.code;
 
       //如果订单状态为已支付
-      if (datajson.actionBody.needsolution.status && (datajson.actionBody.needsolution.status == "PAID" || datajson.actionBody.needsolution.status == "USER_PAY_PRODUCE")) {
+      if (datajson.actionBody.needsolution.status == "PAID") {
         //查询业务员信息并填充到obj
         if (datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId) {
           //去数据库查询该业务员信息
+          obj.salesmanOpcode = `root10/bizgroup01/g1members/${datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId}`;
           try {
             let resInfo = await this.userService.getSalesmanInfo(datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId);
             if (resInfo) {
@@ -170,7 +171,6 @@ class BaiduHandler {
               obj.servicerCode = resInfo.company_id;
             }
           } catch (error) {
-            obj.salesmanOpcode = `root10/bizgroup01/g1members/${datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId}`;
             console.log("salesmanChannelId: " + datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId + "获取业务员opcode失败:" + error)
           }
         }
@@ -204,7 +204,7 @@ class BaiduHandler {
       console.log("pushOrderDelivery插入数据成功---------------------------------" + rtn.stdout);
       var j = JSON.parse(rtn.stdout);
       if (j.status == 0) {
-        await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);
+        await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);
         j.status = 1;
       }
       return j
@@ -245,7 +245,7 @@ class BaiduHandler {
         var rtn = await rc.execPost3(params, requrl);
         var j = JSON.parse(rtn.stdout);
         if (j.status == 0) {
-          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入缓存
+          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入缓存
           j.status = 1;
 
         }
@@ -322,6 +322,9 @@ class BaiduHandler {
       if (data.needsolution.bizType == "food") {
         obj.businessType = "food";
       }
+      if (data.needsolution.bizType == "GSREG") {
+        obj.businessType = "companyCase";
+      }
     }
     if (data.needsolution.typeName) { //产品名称
       if (data.needsolution.typeName == "icp申请") {
@@ -382,10 +385,10 @@ class BaiduHandler {
       if (data.needsolution.customerInfo.publishMobile) {//联系电话
         obj.baseInfo.contactsPhone = data.needsolution.customerInfo.publishMobile;
       }
+    }
     if (data.needsolution.customerRemark) {//备注信息
       obj.baseInfo.memoInfo = data.needsolution.customerRemark;
     }
-    }
     if (data.needsolution.customerMaterial) {//客户上传所有材料
       obj.baseInfo.customerMaterial = data.needsolution.customerMaterial;
     }

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

@@ -26,7 +26,7 @@ class PannongHandler {
         let j = JSON.parse(rtn.stdout);
         if (j.status == 0) {
           j.status = 1;
-          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入redis缓存
+          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存
           j.status = 1;
         }
         return j;
@@ -56,7 +56,7 @@ class PannongHandler {
         let j = JSON.parse(rtn.stdout);
         if (j.status == 0) {
           j.status = 1;
-          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180000);//插入redis缓存
+          await this.cacheManager["AliCache"].cache(cachestr, JSON.stringify({ cachestr: cachestr }), 180);//插入redis缓存
         }
         return j;
       }

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

@@ -36,18 +36,19 @@ class Zc360Handler {
 
       //如果订单状态为已支付
       //查询业务员信息并填充到obj
-      if (datajson.actionBody.needsolution.salesmanInfo.salesmanId) {
+      if (datajson.actionBody.needsolution.salesmanInfo.salesmanId || datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId) {
+        let userId = datajson.actionBody.needsolution.salesmanInfo.salesmanId || datajson.actionBody.needsolution.salesmanInfo.salesmanChannelId;
+        obj.salesmanOpcode = `root10/bizgroup01/g1members/${userId}`;
         //去数据库查询该业务员信息
         try {
-          let resInfo = await this.userService.getSalesmanInfo(datajson.actionBody.needsolution.salesmanInfo.salesmanId);
+          let resInfo = await this.userService.getSalesmanInfo(userId);
           if (resInfo) {
             obj.salesmanOpcode = resInfo.opath;
             obj.salesmanName = obj.salesmanName || resInfo.nickName;
             obj.servicerCode = resInfo.company_id;
           }
         } catch (error) {
-          console.log("salesmanId: " + datajson.actionBody.needsolution.salesmanInfo.salesmanId + "获取业务员opcode失败:" + error)
-          obj.salesmanOpcode = `root10/bizgroup01/g1members/${datajson.actionBody.needsolution.salesmanInfo.salesmanId}`;
+          console.log("salesmanId: " + userId + "获取业务员opcode失败:" + error)
         }
       }
 

center-manage/app/config/routes/api.js

@@ -87,10 +87,10 @@ module.exports = function (app) {
           isAllocated: true,
           skilltags: [...skilltags].join()
         }
-        uf = await userS.registerByTantent(reguser)
+        uf = await userS.registerByTantent(reguser);
       }
       let rtnobj = await userS.loginApp(appkey, userName);
-      res.json(System.getResult({ openurl: rtnobj.homePage + "?code=" + rtnobj.code }))
+      res.json(System.getResult({ openurl: rtnobj.homePage + "?code=" + rtnobj.code }));
     } catch (e) {
       res.json(System.getResult(null, e.message));
     }