Commit d1df8eda by xiaoer.li@freemud.com

fix

parent 20fbd004
...@@ -450,13 +450,15 @@ public class CalculationCommonService { ...@@ -450,13 +450,15 @@ 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);
if (isFixed) {
com.setOriginalPrice(comb.getFinalPrice());
com.setQty(comb.getQty() * cartGoods.getQty());
} else {
com.setQty(comb.getQty() * cartGoods.getQty()); com.setQty(comb.getQty() * cartGoods.getQty());
com.setOriginalPrice(comb.getFinalPrice()); com.setOriginalPrice(comb.getFinalPrice());
} //if (isFixed) {
// com.setOriginalPrice(comb.getFinalPrice());
// com.setQty(comb.getQty() * cartGoods.getQty());
//} else {
// com.setQty(comb.getQty() * cartGoods.getQty());
// com.setOriginalPrice(comb.getFinalPrice());
//}
//todo //todo
BlockRow row = discount.get(comb.getGoodsId()); BlockRow row = discount.get(comb.getGoodsId());
......
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