Merge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

center-channel/app/base/service/impl/common/regCenterOrderSve.js

@@ -228,8 +228,11 @@ class RegCenterOrderService extends AppServiceBase {
   pobj.actionBody.type_name = data.data.type_name;
   pobj.actionBody.channel_type_code = data.data.channel_type_code;
   pobj.actionBody.channel_type_name = data.data.channel_type_name;
+  pobj.actionBody.idempotentId = pobj.actionBody.intentionBizId;
+  pobj.actionBody.idempotentSourceName = pobj.appInfo.app_name;
   if (pobj.actionBody.channel_type_code) {
    pobj.actionBody.type = regCfg.channelTypeCode[pobj.actionBody.channel_type_code]
+   pobj.actionBody.idempotentSource = "baidu_gsreg";
   }
   if (pobj.actionBody.description && pobj.actionBody.description.indexOf("备#") < 0) {
     pobj.actionBody.level = "A";
@@ -258,7 +261,7 @@ class RegCenterOrderService extends AppServiceBase {
         pobj.actionBody.description = pobj.actionBody.description + "（" + pobj.actionBody.probability + "） "
       }
       pobj.actionBody.idempotentId = pobj.actionBody.intentionBizId;
-      pobj.actionBody.idempotentSource = pobj.actionBody.type;
+      // pobj.actionBody.idempotentSource = pobj.actionBody.type;
       pobj.actionBody.customerName = pobj.actionBody.userName;
       //2021-1-21 laolan add new 
       pobj.actionBody.appName = pobj.appInfo.app_name || '',

center-channel/app/base/service/impl/utilsSve/utilsNeedSve.js

@@ -1418,14 +1418,20 @@ class UtilsNeedService extends AppServiceBase {
     pobj.actionBody.channel_type_code = data.data.channel_type_code;
     pobj.actionBody.channel_type_name = data.data.channel_type_name;
     pobj.actionBody.type = pobj.actionBody.channel_type_code;
+    pobj.actionBody.idempotentId = pobj.actionBody.intentionBizId;
+    pobj.actionBody.idempotentSourceName = pobj.appInfo.app_name;
     if (pobj.actionBody.channel_type_code == 5) {
       pobj.actionBody.type = "baidu.icp";
+      pobj.actionBody.idempotentSource = "baidu_icp";
     } else if (pobj.actionBody.channel_type_code == 7) {
       pobj.actionBody.type = "baidu.edi";
+      pobj.actionBody.idempotentSource = "baidu_edi";
     } else if (pobj.actionBody.channel_type_code == "NC") {
       pobj.actionBody.type = "baidu.wangwen";
+      pobj.actionBody.idempotentSource = "baidu_wangwen";
     } else if (pobj.actionBody.channel_type_code == "RT") {
       pobj.actionBody.type = "baidu.radiotv";
+      pobj.actionBody.idempotentSource = "baidu_radiotv";
     }
     if (pobj.actionBody.description && pobj.actionBody.description.indexOf("备#") < 0) {
       pobj.actionBody.level = "A";
@@ -1463,7 +1469,7 @@ class UtilsNeedService extends AppServiceBase {
           pobj.actionBody.description = pobj.actionBody.description + "（" + pobj.actionBody.probability + "） "
         }
         pobj.actionBody.idempotentId = pobj.actionBody.intentionBizId;
-        pobj.actionBody.idempotentSource = pobj.actionBody.type;
+        // pobj.actionBody.idempotentSource = pobj.actionBody.type;
         pobj.actionBody.customerName = pobj.actionBody.userName;
         //2021-1-21 laolan add new 
         pobj.actionBody.appName = pobj.appInfo.app_name || '',

center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js

@@ -18,6 +18,7 @@ class UtilsOrderService extends AppServiceBase {
     this.centerAppPayUrl = settings.centerAppUrl() + "payment/paymentApi/springBoard";
     this.paySecret = settings.paySecret()
     this.utils360Sve = system.getObject("service.utilsSve.utils360Sve");
+    this.dingClient = system.getObject("util.dingClient");
   };
   /*
 * 订单验证
@@ -1138,7 +1139,9 @@ class UtilsOrderService extends AppServiceBase {
         pobj.pushObj = {
           ApplicationStatus
         };
-        this.utils360Sve.pushOrderStatus(pobj)
+        this.utils360Sve.pushOrderStatus(pobj);
+        //钉钉机器人
+        this.dingClient.gatewayPushByChannel(params.orderNo,pobj.appInfo);
       }
       opOrderResult.data = null;
       return opOrderResult;

center-channel/app/base/utils/dingClient.js

@@ -17,5 +17,20 @@ class dingClient {
       });
     }
   }
+
+  //渠道钉钉提醒
+  async gatewayPushByChannel(orderNo,appInfo){
+    let gatewayUrl = setttings.dingRobotUrl(appInfo.uapp_id);
+    if (process.env.APP_ENV === "prod" && gatewayUrl) {
+      let c = `注意提醒：${appInfo.app_name}->有订单待处理，订单号${orderNo}，老板们加油，加油，加油 ！！！`
+      let t = new Date().toLocaleString()
+      this.execClient.execPost({
+        "msgtype": "text",
+        "text": {"content": t + c}
+      }, gatewayUrl).catch(err => {
+        console.log(err)
+      });
+    }
+  }
 }
 module.exports = dingClient;

center-channel/app/config/settings.js

@@ -443,6 +443,12 @@ var settings = {
       // 2020 1119 lin 正式环境已经给出，鲁班发的ip
       return "http://139.196.159.202:8980/"
     }
+  },
+  dingRobotUrl: function(uapp_id) {
+    if(uapp_id == 50){//360云商机
+      return "https://oapi.dingtalk.com/robot/send?access_token=2947bdf6163288a5a5c654640e78ea718d21fcae6601efbb4edd53209abc1c45";
+    }
+    return "";
   }
 };
 module.exports = settings;