...
|
...
|
@@ -74,11 +74,13 @@ exports.cartPay = (params) => { |
|
|
return Promise.all([
|
|
|
cartPayAPI, // 0. 订单数据
|
|
|
orderComputeAPI,
|
|
|
shoppingAPI.getValidCouponCount(params.uid) // 2. 有效优惠券
|
|
|
shoppingAPI.getValidCouponCount(params.uid), // 2 有效优惠券
|
|
|
shoppingAPI.countUsableGiftCard(params.uid) // 3 可用礼品卡数量
|
|
|
]).then(res => {
|
|
|
let pay = res[0];
|
|
|
let orderCompute = _.get(res[1], 'data', {});
|
|
|
let validCouponCount = _.get(res[2], 'data.count', 0);
|
|
|
let validGiftCardCount = _.get(res[3], 'data.count', 0);
|
|
|
|
|
|
let goodsList = _.get(pay, 'data.goods_list', []);
|
|
|
|
...
|
...
|
@@ -97,9 +99,13 @@ exports.cartPay = (params) => { |
|
|
result = Object.assign(
|
|
|
result,
|
|
|
paymentProcess.tranformPayment(pay.data, params.orderInfo, params.cartType, skuList, orderCompute),
|
|
|
|
|
|
{
|
|
|
coupon: paymentProcess.coupon(validCouponCount, params.orderInfo, orderCompute)
|
|
|
coupon: paymentProcess.coupon(validCouponCount, params.orderInfo, orderCompute),
|
|
|
giftCards: paymentProcess.handleGiftCards({
|
|
|
validGiftCardCount: validGiftCardCount,
|
|
|
orderInfo: params.orderInfo,
|
|
|
orderCompute: orderCompute
|
|
|
})
|
|
|
}
|
|
|
);
|
|
|
|
...
|
...
|
|