Skip to content

O
order-group
Commit 8ca7a686 by 周晓航
Options

修改 商品现价 原价的金额显示, 

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent 7ad87a4f
Showing with 8 additions and 8 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
...@@ -836,14 +836,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -836,14 +836,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo); this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
} }
// 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除 // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(0L); // shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(0L);
shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(0L); // if (CollectionUtils.isNotEmpty(shoppingCartGoodsResponseVo.getProducts())) {
if (CollectionUtils.isNotEmpty(shoppingCartGoodsResponseVo.getProducts())) { // long shoppingCartGoodsAmount = shoppingCartGoodsResponseVo.getProducts().stream().mapToLong(CartGoods::getAmount).sum();
long shoppingCartGoodsAmount = shoppingCartGoodsResponseVo.getProducts().stream().mapToLong(CartGoods::getAmount).sum(); // shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(shoppingCartGoodsAmount);
shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(shoppingCartGoodsAmount); // }
long shoppingCartOriginalGoodsAmount = shoppingCartGoodsResponseVo.getProducts().stream().mapToLong(CartGoods::getOriginalAmount).sum();
shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(shoppingCartOriginalGoodsAmount);
}
if (CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getSendGoods())) { if (CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getSendGoods())) {
PremiumExchangeRequestVo request = new PremiumExchangeRequestVo(); PremiumExchangeRequestVo request = new PremiumExchangeRequestVo();
...@@ -2298,6 +2295,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -2298,6 +2295,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if (Objects.isNull(shoppingCartInfoRequestVo)) { if (Objects.isNull(shoppingCartInfoRequestVo)) {
return; return;
} }
// 这两行为了 展示 商品的 原价以及现在的购买价格 不需要包装费, fisherman 目前需求: 是否满足配送 按照商品原价|现价匹配
shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(shoppingCartGoodsResponseVo.getTotalAmount());
shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount());
// 到店自取包装费设为null,外卖要计算包装费，flag为1表示去结算 // 到店自取包装费设为null,外卖要计算包装费，flag为1表示去结算
// 兼容老版本判断null // 兼容老版本判断null
if (Objects.equals(shoppingCartInfoRequestVo.getOrderType(), CreateOrderType.COLLECT_GOODS.getCode()) if (Objects.equals(shoppingCartInfoRequestVo.getOrderType(), CreateOrderType.COLLECT_GOODS.getCode())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment