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

@@ -474,7 +474,7 @@ class tmqueryCtl extends CtlBase {
           actionBody: {
           actionBody: {
             channelUserId: pushData.jdPin,
             channelUserId: pushData.jdPin,
             payStatus: "yfk",
             payStatus: "yfk",
-            channelItemCode: pushData.serviceCode,
+            channelItemCode: pushData.skuId,
             needNoOrderNo: pushData.orderId,
             needNoOrderNo: pushData.orderId,
             buyerMoblie: pushData.mobile
             buyerMoblie: pushData.mobile
           },
           },
@@ -488,6 +488,8 @@ class tmqueryCtl extends CtlBase {
           actionType: "addOrderAndDelivery",
           actionType: "addOrderAndDelivery",
           actionBody: {
           actionBody: {
             channelUserId: pushData.jdPin,
             channelUserId: pushData.jdPin,
+            payStatus: "yfk",
+            channelItemCode: pushData.skuId,
             needNo: pushData.skuId + "_" + pushData.orderId,
             needNo: pushData.skuId + "_" + pushData.orderId,
             needNoOrderNo: pushData.orderId,
             needNoOrderNo: pushData.orderId,
             buyerMoblie: pushData.mobile
             buyerMoblie: pushData.mobile
@@ -495,15 +497,21 @@ class tmqueryCtl extends CtlBase {
           isUser: "yes"
           isUser: "yes"
         };
         };
       }//商标注册【专家辅助申请】、商标注册【担保申请】和 除商标之外的产品
       }//商标注册【专家辅助申请】、商标注册【担保申请】和 除商标之外的产品
+
+
       var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard";
       var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard";
+
+      this.logClient.error("jd", "req---->pushJdPayOrder---->params:" + JSON.stringify(param) + "，reqUrl:" + reqUrl);
+      
       var resultUser = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
       var resultUser = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
       if (!resultUser) {
       if (!resultUser) {
+        this.logClient.error("jd", "req---->pushJdPayOrder---->error:" + JSON.stringify(resultUser));
         return system.getResult(null, "req error");
         return system.getResult(null, "req error");
       }
       }
       return resultUser;
       return resultUser;
 
 
     } catch (error) {
     } catch (error) {
-      console.log(error.stack, "操作error...................");
+      this.logClient.error("jd", "req---->pushJdPayOrder---->操作error:" + error.stack);
       return system.getResultFail(-200, "操作error");
       return system.getResultFail(-200, "操作error");
     }
     }
   }
   }