Merge branch 'feature/orderEnsurefreight' into 'release/5.4.1'

套餐结算页选择优惠券返回修复

1、套餐结算页选择运费，涮新未选中修复。
2、套餐结算页提交订单，参数有误修复。
3、套餐结算页支付方式和支付方式ID修复。
4、优惠券选择返回修复。

See merge request !286

@@ -118,7 +118,7 @@ exports.orderEnsure = (req, res, next) => {
 exports.orderCompute = (req, res, next) => {
 exports.orderCompute = (req, res, next) => {
     let cartType = req.body.cartType || 'ordinary';
     let cartType = req.body.cartType || 'ordinary';
     let deliveryId = req.body.deliveryId || 1;
     let deliveryId = req.body.deliveryId || 1;
-    let paymentTypeId = req.body.paymentTypeId || 1;
+    let paymentType = req.body.paymentType || 1;
     let couponCode = req.body.couponCode || null;
     let couponCode = req.body.couponCode || null;
     let yohoCoin = req.body.yohoCoin || null;
     let yohoCoin = req.body.yohoCoin || null;
     let productSku = req.body.productSku || null;
     let productSku = req.body.productSku || null;
@@ -131,11 +131,11 @@ exports.orderCompute = (req, res, next) => {
         if (req.body.cartType === 'bundle') {
         if (req.body.cartType === 'bundle') {
             let activityInfo = JSON.parse(req.cookies['activity-info']);
             let activityInfo = JSON.parse(req.cookies['activity-info']);
 
 
-            cartModel.orderCompute(uid, cartType, deliveryId, paymentTypeId, couponCode, yohoCoin, null, activityInfo).then(result => {
+            cartModel.orderCompute(uid, cartType, deliveryId, paymentType, couponCode, yohoCoin, null, activityInfo).then(result => {
                 res.json(result);
                 res.json(result);
             }).catch(next);
             }).catch(next);
         } else {
         } else {
-            cartModel.orderCompute(uid, cartType, deliveryId, paymentTypeId, couponCode, yohoCoin, skuList).then(result => {
+            cartModel.orderCompute(uid, cartType, deliveryId, paymentType, couponCode, yohoCoin, skuList).then(result => {
                 res.json(result);
                 res.json(result);
             }).catch(next);
             }).catch(next);
         }
         }
@@ -159,7 +159,7 @@ exports.orderSub = (req, res, next) => {
     let paymentType = req.body.paymentType || 1;
     let paymentType = req.body.paymentType || 1;
     let msg = req.body.msg || null;
     let msg = req.body.msg || null;
     let couponCode = req.body.couponCode || null;
     let couponCode = req.body.couponCode || null;
-    let yohoCoin = req.body.yohoCoin || 1;
+    let yohoCoin = req.body.yohoCoin || 0;
     let skuList = req.body.skuList || '';
     let skuList = req.body.skuList || '';
     let orderInfo;
     let orderInfo;
 
 
@@ -224,7 +224,7 @@ exports.orderSub = (req, res, next) => {
         let result;
         let result;
 
 
         /* tar modified 161206 套餐 */
         /* tar modified 161206 套餐 */
-        if (req.body.activityType === 'bundle') {
+        if (req.body.cartType === 'bundle') {
             let activityInfo = JSON.parse(req.cookies['activity-info']);
             let activityInfo = JSON.parse(req.cookies['activity-info']);
 
 
             result = yield cartModel.orderSub(uid, addressId, 'bundle', deliveryTimeId,
             result = yield cartModel.orderSub(uid, addressId, 'bundle', deliveryTimeId,
@@ -261,7 +261,6 @@ exports.selectCoupon = (req, res) => {
 
 
     let headerData = headerModel.setNav({
     let headerData = headerModel.setNav({
         navTitle: '选择优惠券',
         navTitle: '选择优惠券',
-        backUrl: helpers.urlFormat('/cart/index/new/orderEnsure', {cartType: req.cookies._cartType}),
         navBtn: false
         navBtn: false
     });
     });
 
 

@@ -12,8 +12,8 @@ const BAD_REQUEST = '非法请求';
 const SLAT = 'yohobuyseckill98';
 const SLAT = 'yohobuyseckill98';
 
 
 exports.ensure = (req, res, next) => {
 exports.ensure = (req, res, next) => {
-    const sku = Number.parseInt(req.query.sku, 10);
-    const skn = Number.parseInt(req.query.skn, 10);
+    const sku = parseInt(req.query.sku, 10);
+    const skn = parseInt(req.query.skn, 10);
     const uid = req.user.uid;
     const uid = req.user.uid;
     let activityId;
     let activityId;
 
 
@@ -116,7 +116,7 @@ exports.ensure = (req, res, next) => {
 exports.compute = (req, res, next) => {
 exports.compute = (req, res, next) => {
     const uid = req.user.uid,
     const uid = req.user.uid,
         sku = req.body.sku,
         sku = req.body.sku,
-        paymentType = Number.parseInt(req.body.paymentType || 1, 10),
+        paymentType = parseInt(req.body.paymentType || 1, 10),
         activityId = req.body.activityId;
         activityId = req.body.activityId;
 
 
     if (!req.xhr) {
     if (!req.xhr) {
@@ -155,10 +155,10 @@ exports.submit = (req, res, next) => {
     const uid = req.user.uid,
     const uid = req.user.uid,
         sku = req.body.sku,
         sku = req.body.sku,
         activityId = req.body.activityId,
         activityId = req.body.activityId,
-        deliveryTime = Number.parseInt(req.body.deliveryTime, 10),
-        deliveryWay = Number.parseInt(req.body.deliveryWay, 10),
-        paymentId = Number.parseInt(req.body.paymentId, 10),
-        paymentType = Number.parseInt(req.body.paymentType, 10),
+        deliveryTime = parseInt(req.body.deliveryTime, 10),
+        deliveryWay = parseInt(req.body.deliveryWay, 10),
+        paymentId = parseInt(req.body.paymentId, 10),
+        paymentType = parseInt(req.body.paymentType, 10),
         token = req.body.cartToken;
         token = req.body.cartToken;
 
 
     let addressId = req.body.addressId || '';
     let addressId = req.body.addressId || '';
@@ -176,7 +176,7 @@ exports.submit = (req, res, next) => {
     if (!addressId) {
     if (!addressId) {
         return res.json({code: 400, message: '请选择地址'});
         return res.json({code: 400, message: '请选择地址'});
     } else {
     } else {
-        addressId = Number.parseInt(crypto.decrypt(null, req.body.addressId), 10);
+        addressId = parseInt(crypto.decrypt(null, req.body.addressId), 10);
     }
     }
 
 
     if ([uid, sku, activityId, addressId, deliveryTime,
     if ([uid, sku, activityId, addressId, deliveryTime,
@@ -193,7 +193,7 @@ exports.submit = (req, res, next) => {
         buy_number: 1,
         buy_number: 1,
         invoices_title: req.body.invoicesTitle || '',
         invoices_title: req.body.invoicesTitle || '',
         invoices_type_id: req.body.invoicesTypeId || '',
         invoices_type_id: req.body.invoicesTypeId || '',
-        use_yoho_coin: Number.parseFloat(req.body.useYohoCoin) || 0,
+        use_yoho_coin: parseFloat(req.body.useYohoCoin) || 0,
         remark: req.body.remark || '',
         remark: req.body.remark || '',
 
 
         address_id: addressId,
         address_id: addressId,

@@ -71,7 +71,7 @@ exports.cartPay = (uid, cartType, orderInfo, limitProductCode, sku, skn, buyNumb
             orderInfo.deliveryId,
             orderInfo.deliveryId,
             orderInfo.paymentType,
             orderInfo.paymentType,
             orderInfo.couponCode,
             orderInfo.couponCode,
-            orderInfo.yohoCoin, skuList
+            orderInfo.yohoCoin, skuList, activityInfo
         );
         );
     }
     }
 
 

@@ -219,7 +219,7 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime,
     // 购买套餐商品需要的数据
     // 购买套餐商品需要的数据
     if (activityInfo) {
     if (activityInfo) {
         params.activity_id = activityInfo.activity_id;
         params.activity_id = activityInfo.activity_id;
-        params.product_sku_list = activityInfo.product_sku_list; // TODO 检查 JSON 是否正常
+        params.product_sku_list = JSON.stringify(activityInfo.product_sku_list);
     }
     }
 
 
     // 友盟有关信息的传递
     // 友盟有关信息的传递

@@ -58,8 +58,6 @@ function invoiceInit() {
         $('.invoice-type').text(invoiceCont[orderCont.invoiceType] + '(' + invoicesType[orderCont.invoicesType] + ')');
         $('.invoice-type').text(invoiceCont[orderCont.invoiceType] + '(' + invoicesType[orderCont.invoicesType] + ')');
     } else {
     } else {
         $('.invoice-type').text('服装(电子)');
         $('.invoice-type').text('服装(电子)');
-
-        // $('.invoice-type').text('服装(纸质)');
     }
     }
 }
 }
 
 
@@ -191,7 +189,7 @@ function orderCompute() {
         data = {
         data = {
             cartType: orderInfo('cartType') || 'ordinary',
             cartType: orderInfo('cartType') || 'ordinary',
             deliveryId: orderInfo('deliveryId'),
             deliveryId: orderInfo('deliveryId'),
-            paymentTypeId: orderInfo('paymentTypeId'),
+            paymentType: orderInfo('paymentType'),
             couponCode: orderInfo('couponCode'),
             couponCode: orderInfo('couponCode'),
             yohoCoin: yohoCoin,
             yohoCoin: yohoCoin,
             skuList: isLimitGood() ? orderInfo('skuList') : undefined
             skuList: isLimitGood() ? orderInfo('skuList') : undefined
@@ -294,7 +292,6 @@ function submitOrder() {
             couponCode: orderInfo('couponCode'),
             couponCode: orderInfo('couponCode'),
             yohoCoin: orderInfo('yohoCoin'),
             yohoCoin: orderInfo('yohoCoin'),
             skuList: isLimitGood() ? orderInfo('skuList') : undefined
             skuList: isLimitGood() ? orderInfo('skuList') : undefined
-
         }
         }
     }).then(function(res) {
     }).then(function(res) {
         var url;
         var url;
@@ -358,7 +355,10 @@ $('.delivery-id').on('touchend', 'li', function() {
 });
 });
 
 
 $('.payment-type').on('touchend', 'li', function() {
 $('.payment-type').on('touchend', 'li', function() {
-    orderInfo('paymentType', $('.icon-cb-radio', this).data('id'));
+    var $paymentType = $('.icon-cb-radio', this);
+
+    orderInfo('paymentTypeId', $paymentType.data('id')); // 支付方式id
+    orderInfo('paymentType', $paymentType.data('payment-type')); // 支付方式
 });
 });
 
 
 $('.dispatch-time').on('touchend', 'li', function() {
 $('.dispatch-time').on('touchend', 'li', function() {
@@ -418,14 +418,6 @@ $('#msg').find('textarea').on('blur', function() {
     orderInfo('msg', $(this).val());
     orderInfo('msg', $(this).val());
 });
 });
 
 
-$('.pay-mode').on('click', 'li', function() {
-    var $this = $(this);
-
-    orderInfo('paymentTypeId', $this.data('pay-id'));
-    orderInfo('paymentType', $this.data('pay-type'));
-    payType = $this.data('pay-type');
-});
-
 $('form').on('submit', function() {
 $('form').on('submit', function() {
     return false;
     return false;
 });
 });
@@ -478,15 +470,18 @@ $subBlock.on('touchstart', 'li', function() {
 
 
 
 
 $('.bill a').on('touchstart', function() {
 $('.bill a').on('touchstart', function() {
+    var $paymentType;
+
     if (isTickets) {
     if (isTickets) {
         ticketsConfirm(); // eslint-disable-line
         ticketsConfirm(); // eslint-disable-line
         return;
         return;
-
     }
     }
-    orderInfo('paymentTypeId', $('.delivery-id .icon-cb-radio').data('id'));
-    orderInfo('paymentType', $('.payment-type .icon-cb-radio').data('id'));
 
 
-    payType = $('.payment-type .icon-cb-radio').data('id');
+    $paymentType = $('.payment-type .icon-cb-radio');
+    orderInfo('paymentTypeId', $paymentType.data('id')); // 支付方式id
+    orderInfo('paymentType', $paymentType.data('payment-type')); // 支付方式
+
+    payType = $paymentType.data('payment-type');
     submitOrder();
     submitOrder();
 });
 });
 
 

@@ -59,7 +59,7 @@ $newCoupon.on('submit', function() {
             orderInfo('yohoCoin', 0);
             orderInfo('yohoCoin', 0);
             orderInfo('couponCode', res.data.coupon_code);
             orderInfo('couponCode', res.data.coupon_code);
             orderInfo('couponName', res.data.coupon_title);
             orderInfo('couponName', res.data.coupon_title);
-            window.location.href = '/cart/index/new/orderEnsure';
+            history.go(-1);
         }
         }
     }).fail(function() {
     }).fail(function() {
         tip.show('网络错误');
         tip.show('网络错误');
@@ -85,7 +85,7 @@ $('body').on('touchend', '.not-use', function() {
 
 
     // 实付金额发生变化，使用有货币为0
     // 实付金额发生变化，使用有货币为0
     orderInfo('yohoCoin', 0);
     orderInfo('yohoCoin', 0);
-    location.href = '/cart/index/new/orderEnsure';
+    history.go(-1);
 });
 });
 
 
 
 
@@ -142,7 +142,7 @@ function getCouponHandle(allCoupons) {
 
 
                 // 实付金额发生变化，使用有货币为0
                 // 实付金额发生变化，使用有货币为0
                 orderInfo('yohoCoin', 0);
                 orderInfo('yohoCoin', 0);
-                window.location.href = '/cart/index/new/orderEnsure';
+                history.go(-1);
             } else if (res.message) {
             } else if (res.message) {
                 tip.show(res.message);
                 tip.show(res.message);
             }
             }

@@ -22,8 +22,7 @@ var $invoiceNotice = $('.invoice-notice'),
     $copyTel = $('.copy-tel'),
     $copyTel = $('.copy-tel'),
     isModifyTel = false;
     isModifyTel = false;
 
 
-var myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\d{8})$/,
-    linkUrl = document.referrer || '/cart/index/new/orderEnsure?cartType=ordinary';
+var myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(17[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
 
 
 var C_ID = window._ChannelVary[window.cookie('_Channel')] || 1;
 var C_ID = window._ChannelVary[window.cookie('_Channel')] || 1;
 
 
@@ -93,13 +92,13 @@ function confirmAction() {
                     autoHide: true,
                     autoHide: true,
                     fast: true
                     fast: true
                 });
                 });
-                window.location.href = linkUrl;
+                history.go(-1);
             }, function() {
             }, function() {
-                window.location.href = linkUrl;
+                history.go(-1);
             });
             });
         }
         }
     } else {
     } else {
-        window.location.href = linkUrl;
+        history.go(-1);
     }
     }
 }
 }