tj

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

@@ -13,6 +13,7 @@ class UtilsOpOrderService extends AppServiceBase {
     }
     var reqUrl = this.centerOrderUrl + "opaction/opOrder/springBoard";
     var result = await this.restPostUrl(pobj, reqUrl);
+    this.opUpdatePushInfo(result, pobj, actionBody, "pushUpdateContacts");
     return result;
   }
   async updateTmOrder(pobj, actionBody) {
@@ -21,7 +22,26 @@ class UtilsOpOrderService extends AppServiceBase {
     }
     var reqUrl = this.centerOrderUrl + "opaction/opOrder/springBoard";
     var result = await this.restPostUrl(pobj, reqUrl);
+    this.opUpdatePushInfo(result, pobj, actionBody, "pushUpdateOrder");
     return result;
   }
+  async opUpdatePushInfo(result, pobj, actionBody, opType) {
+    if (result.status == 0 && result.data.orderStatus > 2) {
+      actionBody.product_info = product_info;
+      result.data = actionBody;
+      result.data.appInfo = {
+        uapp_id: pobj.appInfo.uapp_id,
+        uapp_key: pobj.appInfo.uapp_key,
+        app_code: pobj.appInfo.app_code,
+        app_name: pobj.appInfo.app_name
+      };
+      result.data.userInfo = {
+        channel_userid: pobj.userInfo.channel_userid,
+        channel_username: pobj.userInfo.channel_username,
+        channel_nickname: pobj.userInfo.channel_nickname
+      };
+      this.utilsPushSve.pushInfo(result.data, opType);
+    }
+  }
 }
 module.exports = UtilsOpOrderService;

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

@@ -393,7 +393,7 @@ class UtilsOrderService extends AppServiceBase {
         return resultSign;
       }
       //获取充值业务锁
-      await this.cacheManager["TlPayLocker"].init(parmas.out_trade_no);//---测试时放开
+      // await this.cacheManager["TlPayLocker"].init(parmas.out_trade_no);//---测试时放开
       var locker = await this.cacheManager["TlPayLocker"].enter(parmas.out_trade_no);
       if (!locker || locker != "1") {
         this.logCtl.info({
@@ -433,7 +433,7 @@ class UtilsOrderService extends AppServiceBase {
       }
       opResult.data = null;
       return opResult;
-
+      
     } catch (e) {
       await this.cacheManager["TlPayLocker"].release(parmas.out_trade_no);
       this.logCtl.error({

center-channel/app/front/entry/public/apidoc/platform/tmOrder.md

@@ -243,23 +243,26 @@
 ``` javascript
 {
     "orderNo":"TM26202002271337mkgN",// Y 订单号
-    "tbCode": "TB26202002271337v5y9",// Y 提报号   
-    "ncloneCode": "02",// Y 尼斯大类编码
-    "ncloneName": "颜料油漆",// Y 尼斯大类名称              
-    "nclThree": [
+    "nclList": [
         {
-            "code": "020008",// Y 小项编码
-            "disabled": "false",
-            "fullname": "020008 绘画用铝粉",// Y 小项编码加名称
-            "name": "绘画用铝粉",// N 小项名称
-            "pcode": "0202"// Y 小项所属群组编码
-        },
-        {
-            "code": "020005",
-            "name": "食品用着色剂",
-            "pcode": "0203",
-            "disabled": "false",
-            "fullname": "020005 食品用着色剂"
+            "code": "02",//大类编码
+            "name": "颜料油漆",//大类名称
+            "nclThree": [
+                {
+                    "code": "020008",//小项编码
+                    "disabled": "false",
+                    "fullname": "020008 绘画用铝粉",//小项编码加名称
+                    "name": "绘画用铝粉",//小项名称
+                    "pcode": "0202"//小项所属群组编码
+                },
+                {
+                    "code": "020005",
+                    "disabled": "false",
+                    "fullname": "020005 食品用着色剂",
+                    "name": "食品用着色剂",
+                    "pcode": "0203"
+                }
+            ]
         }
     ]
 }