Skip to content

O
order-group
Commit 081640fc by xiaoer.li@freemud.com
Options

Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

parents 1fdf2e65 735cf458
Showing with 1 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
...@@ -439,7 +439,7 @@ public class CalculationCommonService { ...@@ -439,7 +439,7 @@ public class CalculationCommonService {
com.setUnit(comb.getUnit()); com.setUnit(comb.getUnit());
List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(comb.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new); List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(comb.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new);
com.setExtraList(cartGoodsExtras); com.setExtraList(cartGoodsExtras);
com.setOriginalPrice(com.getOriginalPrice()); com.setOriginalPrice(comb.getOriginalPrice());
//todo //todo
BlockRow row = discount.get(comb.getGoodsId()); BlockRow row = discount.get(comb.getGoodsId());
if (row == null) { if (row == null) {
......
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