fe / yohobuy-node · Commits

Go to a project

Authored by 郝肖肖
Commit 4d301caf44c54693b80277afc7c42a458febd47a 1 parent 397b283d

'价格均摊-划线价格处理'

Inline Side-by-side
Showing 3 changed files with 9 additions and 9 deletions
@@ -144,8 +144,8 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys @@ -144,8 +144,8 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys
144 isAdvance: isAdvanceCart 144 isAdvance: isAdvanceCart
145 }; 145 };
146 146
147 - // 如果是学生或者vip，取优惠价，否则取销售价(sales_price)  
148 - if (goods.isVipPrice || goods.isStuPrice) { 147 + // 划线的价格
  148 + if (it.last_vip_price < it.sales_price) {
149 goods.productPrice = transPrice(it.last_vip_price); 149 goods.productPrice = transPrice(it.last_vip_price);
150 goods.linePrice = transPrice(it.sales_price); // 划线的价格 150 goods.linePrice = transPrice(it.sales_price); // 划线的价格
151 } 151 }
@@ -95,10 +95,10 @@ const handlePaymentInfo = (d, address) => { @@ -95,10 +95,10 @@ const handlePaymentInfo = (d, address) => {
95 g.isVipPrice = g.last_vip_price < g.sales_price && g.discount_tag === 'V'; 95 g.isVipPrice = g.last_vip_price < g.sales_price && g.discount_tag === 'V';
96 g.isStuPrice = g.last_vip_price < g.sales_price && g.discount_tag === 'S'; 96 g.isStuPrice = g.last_vip_price < g.sales_price && g.discount_tag === 'S';
97 97
98 - // 如果是学生或者vip，取优惠价，否则取销售价(sales_price)  
99 - if (g.isVipPrice || g.isStuPrice) { 98 + // 划线的价格
  99 + if (g.last_vip_price < g.sales_price) {
100 g.productPrice = g.last_vip_price; 100 g.productPrice = g.last_vip_price;
101 - g.linePrice = g.sales_price; // 划线的价格 101 + g.linePrice = g.sales_price;
102 } 102 }
103 103
104 // 赠品、加价购 104 // 赠品、加价购
@@ -375,8 +375,8 @@ const getOrders = (uid, page, limit, type, isPage)=> { @@ -375,8 +375,8 @@ const getOrders = (uid, page, limit, type, isPage)=> {
375 newGood.isVipPrice = good.real_pay_price < good.sales_price && good.discount_tag === 'V'; 375 newGood.isVipPrice = good.real_pay_price < good.sales_price && good.discount_tag === 'V';
376 newGood.isStuPrice = good.real_pay_price < good.sales_price && good.discount_tag === 'S'; 376 newGood.isStuPrice = good.real_pay_price < good.sales_price && good.discount_tag === 'S';
377 377
378 - // 如果是学生或者vip，取优惠价，否则取销售价(sales_price)  
379 - if (newGood.isVipPrice || newGood.isStuPrice) { 378 + // 划线的价格
  379 + if (good.real_pay_price < good.sales_price) {
380 newGood.price = good.real_pay_price;// 显示分摊价 380 newGood.price = good.real_pay_price;// 显示分摊价
381 newGood.linePrice = good.sales_price; // 划线的价格 381 newGood.linePrice = good.sales_price; // 划线的价格
382 } 382 }
@@ -790,8 +790,8 @@ const _getOrderDetail = co(function * (uid, orderId) { @@ -790,8 +790,8 @@ const _getOrderDetail = co(function * (uid, orderId) {
790 [_getGoodsTag(good.attribute, good.goods_type)]: true 790 [_getGoodsTag(good.attribute, good.goods_type)]: true
791 }; 791 };
792 792
793 - // 如果是学生或者vip，取优惠价，否则取销售价(sales_price)  
794 - if (newGood.isVipPrice || newGood.isStuPrice) { 793 + // 划线的价格
  794 + if (good.real_pay_price < good.sales_price) {
795 newGood.price = good.real_pay_price;// 显示分摊价 795 newGood.price = good.real_pay_price;// 显示分摊价
796 newGood.linePrice = good.sales_price; // 划线的价格 796 newGood.linePrice = good.sales_price; // 划线的价格
797 } 797 }