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

34e255ee · xiaoer.li@freemud.com · 7632bad9 · cec92cab · 34e255ee
Commit 34e255ee authored Oct 22, 2020 by xiaoer.li@freemud.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
+1 -1

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
@@ -104,7 +104,7 @@ public class CalculationCommonService {
        Long originPrice = 0L;
        if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
            for (CartGoods.ComboxGoods com : cartGoods.getProductComboList()) {
-                originPrice +=com.getFinalPrice()*cartGoods.getQty();
+                originPrice += com.getFinalPrice() * cartGoods.getQty() * com.getQty();
            }
        }
        /**