order-computer-modified

@@ -162,30 +162,27 @@ exports.orderCompute = (req, res, next) => {
     let type = req.body.type;
     let type = req.body.type;
 
 
     if (type !== 'tickets') {
     if (type !== 'tickets') {
+        let params = {
+            uid: uid,
+            cart_type: cartType,
+            delivery_way: deliveryId,
+            payment_type: paymentType,
+            coupon_code: couponCode,
+            use_yoho_coin: yohoCoin,
+        };
+
         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: uid,
-                cartType: cartType,
-                deliveryWay: deliveryId,
-                paymentType: paymentType,
-                couponCode: couponCode,
-                yohoCoin: yohoCoin,
+            cartModel.orderCompute(_.assign(params, {
                 activityInfo: activityInfo
                 activityInfo: activityInfo
-            }).then(result => {
+            })).then(result => {
                 res.json(result);
                 res.json(result);
             }).catch(next);
             }).catch(next);
         } else {
         } else {
-            cartModel.orderCompute({
-                uid: uid,
-                cartType: cartType,
-                deliveryWay: deliveryId,
-                paymentType: paymentType,
-                couponCode: couponCode,
-                yohoCoin: yohoCoin,
-                skuList: skuList
-            }).then(result => {
+            cartModel.orderCompute(_.assign(params, {
+                product_sku_list: skuList
+            })).then(result => {
                 res.json(result);
                 res.json(result);
             }).catch(next);
             }).catch(next);
         }
         }

@@ -120,16 +120,7 @@ exports.cartPay = (params) => {
  * @return array 接口返回的数据
  * @return array 接口返回的数据
  */
  */
 exports.orderCompute = (params) => {
 exports.orderCompute = (params) => {
-    return shoppingAPI.orderComputeAPI({
-        uid: params.uid,
-        cart_type: params.cartType,
-        delivery_way: params.deliveryWay,
-        payment_type: params.paymentType,
-        coupon_code: params.couponCode,
-        use_yoho_coin: params.yohoCoin,
-        product_sku_list: params.skuList,
-        activityInfo: params.activityInfo
-    }).then(result => {
+    return shoppingAPI.orderComputeAPI(params).then(result => {
         if (result && result.data) {
         if (result && result.data) {
             result.data.use_yoho_coin = paymentProcess.transPrice(result.data.use_yoho_coin);
             result.data.use_yoho_coin = paymentProcess.transPrice(result.data.use_yoho_coin);
             result.data.yohoCoinCompute = paymentProcess.yohoCoinCompute(result.data);
             result.data.yohoCoinCompute = paymentProcess.yohoCoinCompute(result.data);