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

@@ -563,7 +563,8 @@ class tmqueryCtl extends CtlBase {
           needNo: pushData.skuId + "_" + pushData.orderNumber,
           needNoOrderNo: pushData.orderNumber,//---用此字段查找
           buyerMoblie: pushData.mobile,
-          payCode: pushData.skuId
+          payCode: pushData.skuId,
+          email: pushData.email
         },
         isUser: "yes"
       };
@@ -571,6 +572,7 @@ class tmqueryCtl extends CtlBase {
         param.actionType = pushData.skuId == "FW_GOODS-582206-1" ? "updateOrderPayStatus" : "addOrderAndDelivery";
       }//商标的产品订单
       else {
+        param.actionBody.channelItemCode = pushData.serviceCode;
         param.actionType = "jdAddQifuOrder";
       }//工商产品订单
       var reqUrl = this.channelApiUrl + "/action/tmOrder/springBoard";