Commit 34e255ee by xiaoer.li@freemud.com

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

parents 7632bad9 cec92cab
...@@ -104,7 +104,7 @@ public class CalculationCommonService { ...@@ -104,7 +104,7 @@ public class CalculationCommonService {
Long originPrice = 0L; Long originPrice = 0L;
if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) { if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
for (CartGoods.ComboxGoods com : cartGoods.getProductComboList()) { for (CartGoods.ComboxGoods com : cartGoods.getProductComboList()) {
originPrice +=com.getFinalPrice()*cartGoods.getQty(); originPrice += com.getFinalPrice() * cartGoods.getQty() * com.getQty();
} }
} }
/** /**
......
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