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

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

@@ -530,6 +530,7 @@ class tmqueryCtl extends CtlBase {
       return { success: false, code: -200, msg: error.stack };
       return { success: false, code: -200, msg: error.stack };
     }
     }
   }
   }
+
   async pushJdPayOrder(pushData, req) {//处理京东推送的订单信息
   async pushJdPayOrder(pushData, req) {//处理京东推送的订单信息
     this.info({
     this.info({
       optitle: "###处理京东推送的订单信息参数",
       optitle: "###处理京东推送的订单信息参数",
@@ -562,7 +563,7 @@ class tmqueryCtl extends CtlBase {
           needNo: pushData.skuId + "_" + pushData.orderNumber,
           needNo: pushData.skuId + "_" + pushData.orderNumber,
           needNoOrderNo: pushData.orderNumber,//---用此字段查找
           needNoOrderNo: pushData.orderNumber,//---用此字段查找
           buyerMoblie: pushData.mobile,
           buyerMoblie: pushData.mobile,
-          paySkuId: pushData.skuId
+          payCode: pushData.skuId
         },
         },
         isUser: "yes"
         isUser: "yes"
       };
       };