Merge remote-tracking branch 'origin/hotfix/wechatsub'

@@ -181,6 +181,7 @@ exports.orderSub = (req, res, next) => {
     let yohoCoin = req.body.yohoCoin || 0;
     let skuList = req.body.skuList || '';
     let orderInfo;
+    let isWechat = req.yoho.isWechat;
 
     try {
         orderInfo = JSON.parse(req.cookies['order-info']);
@@ -260,11 +261,11 @@ exports.orderSub = (req, res, next) => {
 
             result = yield cartModel.orderSub(uid, addressId, 'bundle', deliveryTimeId,
                 deliveryId, invoices, paymentTypeId, paymentType, msg, couponCode,
-                yohoCoin, null, unionKey, userAgent, times, activityInfo, ip);
+                yohoCoin, null, unionKey, userAgent, times, activityInfo, ip, isWechat);
         } else {
             result = yield cartModel.orderSub(uid, addressId, cartType, deliveryTimeId,
                 deliveryId, invoices, paymentTypeId, paymentType, msg, couponCode,
-                yohoCoin, skuList, unionKey, userAgent, null, null, ip);
+                yohoCoin, skuList, unionKey, userAgent, null, null, ip, isWechat);
         }
 
         // 提交成功清除Cookie

@@ -178,12 +178,13 @@ exports.ticketsOrderCompute = (uid, productSku, buyNumber, yohoCoin) => {
  * @param string|null $userAgent 联盟过来用户下单时需要的User-Agent信息
  * @param int $times
  * @param null $activityInfo 套餐数据
+ * @param isWechat 是否是微信商城
  * @return array 接口返回的数据
  */
 exports.orderSub = (uid, addressId, cartType, deliveryTime,
     deliveryWay, invoices, paymentId, paymentType, remark,
     couponCode, yohoCoin, skuList, qhyUnio,
-    userAgent, times, activityInfo, ip) => {
+    userAgent, times, activityInfo, ip, isWechat) => {
     if (!qhyUnio) {
         qhyUnio = '';
     }
@@ -215,7 +216,7 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime,
     return shoppingAPI.orderSub(uid, addressId, cartType, deliveryTime,
         deliveryWay, invoices, paymentId, paymentType,
         remark, couponCode, yohoCoin, skuList, qhyUnio,
-        userAgent, times, activityInfo, ip).then(orderSubRes => {
+        userAgent, times, activityInfo, ip, isWechat).then(orderSubRes => {
             let finalResult = {};
 
             if (orderSubRes && orderSubRes.data && orderSubRes.data.is_hint === 'Y') {

@@ -153,11 +153,12 @@ exports.checkTickets = (uid, productSku, buyNumber, useYohoCoin, yohoCoinMode) =
  * @param string|null $userAgent 联盟过来用户下单时需要的User-Agent信息
  * @param $times
  * @param null $activityInfo 套餐信息
+ * @param isWechat 是否是微信商城
  * @return array 接口返回的数据
  */
 exports.orderSub = (uid, addressId, cartType, deliveryTime,
  deliveryWay, invoices, paymentId, paymentType, remark, couponCode,
- yohoCoin, skuList, qhyUnion, userAgent, times, activityInfo, ip) => {
+ yohoCoin, skuList, qhyUnion, userAgent, times, activityInfo, ip, isWechat) => {
     if (!activityInfo) {
         activityInfo = null;
     }
@@ -226,6 +227,11 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime,
         params.qhy_union = qhyUnion;
     }
 
+    // 是否是微信商城
+    if (isWechat) {
+        params.client_type = 'wechat';
+    }
+
     return api.post('', params, {
         headers: {
             'X-Forwarded-For': ip || '',