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

@@ -549,20 +549,29 @@ class tmqueryCtl extends CtlBase {
       if (tokenInfo.status != 0) {
       if (tokenInfo.status != 0) {
         return tokenInfo;
         return tokenInfo;
       }
       }
+
+
       //自助注册产品---用updateOrderPayStatus，否则为addOrderAndDelivery
       //自助注册产品---用updateOrderPayStatus，否则为addOrderAndDelivery
       var param = {
       var param = {
         actionProcess: pushData.actionProcess,
         actionProcess: pushData.actionProcess,
-        actionType: pushData.skuId == "FW_GOODS-582206-1" ? "updateOrderPayStatus" : "addOrderAndDelivery",
+        actionType: "",
         actionBody: {
         actionBody: {
           channelUserId: pushData.jdPin,
           channelUserId: pushData.jdPin,
           payStatus: "yfk",
           payStatus: "yfk",
           channelItemCode: pushData.skuId,//------用此字段查询渠道产品是否存在
           channelItemCode: pushData.skuId,//------用此字段查询渠道产品是否存在
           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
         },
         },
         isUser: "yes"
         isUser: "yes"
       };
       };
+      if (["FW_GOODS-582206-1", "FW_GOODS-582208-1", "FW_GOODS-582207-1"].indexOf(pushData.skuId) >= 0) {
+        param.actionType = pushData.skuId == "FW_GOODS-582206-1" ? "updateOrderPayStatus" : "addOrderAndDelivery";
+      }//商标的产品订单
+      else {
+        param.actionType ="jdAddQifuOrder";
+      }//工商产品订单
       var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard";
       var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard";
       var resultUser = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
       var resultUser = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
       this.info({
       this.info({