Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan…

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

igirl-channel-jdweb/app/base/controller/impl/trademark/tmqueryCtl.js

@@ -107,7 +107,7 @@ class tmqueryCtl extends CtlBase {
         return system.getResult(null, "处理请求失败");
       }
       if (["jd"].indexOf(pobj.actionProcess) >= 0 && pobj.actionType == "subTmOrder") {
-        var opPayPageInfoResult = await this.opPayPageInfo(pobj, req);
+        var opPayPageInfoResult = await this.opPayPageInfo(pobj, result, req);
         return opPayPageInfoResult;
       }
       return result;
@@ -242,7 +242,7 @@ class tmqueryCtl extends CtlBase {
       return system.getResultFail(-200, "操作error");
     }
   }
-  async opPayPageInfo(pobj, req) {
+  async opPayPageInfo(pobj, orderResult, req) {
     if (!pobj.actionBody.itemCode) {
       return system.getResult(null, "itemCode param is not empty");
     }
@@ -271,28 +271,28 @@ class tmqueryCtl extends CtlBase {
     }
     return system.getResultSuccess()
   }
-  // async putPayOrderData() {
-  //   var tokenInfo = await this.getToken(pushData.actionProcess);
-  //   if (tokenInfo.status != 0) {
-  //     return tokenInfo;
-  //   }
-  //   var param = {
-  //     actionProcess: pushData.actionProcess,
-  //     actionType: "updateOrderStatus",
-  //     actionBody: {
-  //       channelUserId: pushData.jdPin,
-  //       channelItemCode: pushData.serviceCode,
-  //       needNoOrderNo: pushData.orderId,
-  //       buyerMoblie: pushData.mobile
-  //     },
-  //     isUser: "yes"
-  //   };
-  //   var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard";
-  //   var resultUser = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
-  //   if (!resultUser) {
-  //     return system.getResult(null, "req error");
-  //   }
-  // }
+  async putPayOrderData() {
+    var tokenInfo = await this.getToken(pushData.actionProcess);
+    if (tokenInfo.status != 0) {
+      return tokenInfo;
+    }
+    var param = {
+      actionProcess: pushData.actionProcess,
+      actionType: "updateOrderStatus",
+      actionBody: {
+        channelUserId: pushData.jdPin,
+        channelItemCode: pushData.serviceCode,
+        needNoOrderNo: pushData.orderId,
+        buyerMoblie: pushData.mobile
+      },
+      isUser: "yes"
+    };
+    var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard";
+    var resultUser = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
+    if (!resultUser) {
+      return system.getResult(null, "req error");
+    }
+  }
   async getPayPageAddr(itemCode, itemCodeList, req) {
     try {
 
@@ -311,7 +311,16 @@ class tmqueryCtl extends CtlBase {
       //POST
       var qs = require('querystring');
       // var post_data = { pin: "syaify", serviceId: 580010, itemCode: "FW_GOODS-580010-1", platform: 6, orderNum: 1, articleType: 1 };//这是需要提交的数据
-      var post_data = { pin: req.session.userPinInfo.channelUserId, serviceId: itemCodeList[1], itemCode: itemCode, platform: 6, orderNum: 1, articleType: 1, additions: { 246: 0 } };//这是需要提交的数据
+
+      var post_data = {
+        pin: req.session.userPinInfo.channelUserId,
+        serviceId: itemCodeList[1],
+        itemCode: itemCode,
+        platform: 6,
+        orderNum: 1,
+        articleType: 1,
+        additions: '{ \"246\": 0 }'
+      };//这是需要提交的数据
 
       // var tmpContent = '{"pin":"syaify","serviceId":"581976","itemCode":"FW_GOODS-581976","platform":6,"orderNum":1,"articleType":1,"additions":{"246":0}}';