fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit cffdc08fed4329b52551753a70eef7274fde7543 2 parents cff902f7 4917e8c3

Merge branch 'feature/cart' into release/5.4.1

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -277,7 +277,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) { @@ -277,7 +277,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) {
277 result.cartPayData = cartData.promotion_formula_list; 277 result.cartPayData = cartData.promotion_formula_list;
278 result.num = cartData.goods_count; 278 result.num = cartData.goods_count;
279 result.goodsPrice = cartData.str_order_amount; 279 result.goodsPrice = cartData.str_order_amount;
280 - result.price = _.isNumber(orderComputeData.last_order_amount) ? 280 + result.price = orderComputeData && _.isNumber(orderComputeData.last_order_amount) ?
281 orderComputeData.last_order_amount : cartData.last_order_amount; 281 orderComputeData.last_order_amount : cartData.last_order_amount;
282 282
283 if (cartData.gain_yoho_coin > 0) { 283 if (cartData.gain_yoho_coin > 0) {