Merge branch 'feature/new-fixbig' into qa

2b0479c0 · xiaoer.li@freemud.com · 7d209271 · dba0a19b · 2b0479c0
Commit 2b0479c0 authored Dec 01, 2020 by xiaoer.li@freemud.com
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
+6 -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
@@ -334,7 +334,12 @@ public class CalculationCommonService {
        if (cartGoods.isWeightType()) {
            cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
        }
-        cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
+        if (calculationGoods!=null) {
+            cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());
+        }
+        else {
+            cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
+        }
        if (calculationGoods!=null) {
            cartGoodsDetailDto.setTotalDiscountAmount(calculationGoods.getDiscountAmount().intValue());
            //cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());