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

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

@@ -337,6 +337,7 @@ public class CalculationCommonService {
         cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
         if (calculationGoods!=null) {
             cartGoodsDetailDto.setTotalDiscountAmount(calculationGoods.getDiscountAmount().intValue());
+            cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());
         }
         else {
             cartGoodsDetailDto.setTotalDiscountAmount(cartGoods.getOriginalAmount().intValue() - cartGoods.getAmount().intValue());
@@ -450,13 +451,15 @@ public class CalculationCommonService {
             com.setUnit(comb.getUnit());
             List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(comb.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new);
             com.setExtraList(cartGoodsExtras);
-            if (isFixed) {
-                com.setOriginalPrice(comb.getFinalPrice());
-                com.setQty(comb.getQty() * cartGoods.getQty());
-            } else {
-                com.setQty(comb.getQty() * cartGoods.getQty());
-                com.setOriginalPrice(comb.getFinalPrice());
-            }
+            com.setQty(comb.getQty() * cartGoods.getQty());
+            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
             BlockRow row = discount.get(comb.getGoodsId());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingEquallyService.java

@@ -101,12 +101,6 @@ public class CalculationSharingEquallyService {
             if (CollectionUtils.isNotEmpty(stocks)) shoppingCartGoodsDto.setStocks(stocks);
         }
 
-        //总计价
-        shoppingCartGoodsDto.setPackageAmount(shoppingCartGoodsResponseVo.getNewPackAmount());
-        shoppingCartGoodsDto.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount());
-        shoppingCartGoodsDto.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount());
-        shoppingCartGoodsDto.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount());
-
         List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = discountResult.getGoods();
 
         /**
@@ -147,6 +141,11 @@ public class CalculationSharingEquallyService {
         shoppingCartGoodsDto.setThresholdAmount(shoppingCartGoodsResponseVo.getThresholdAmount());
         shoppingCartGoodsDto.setIsDiscountDelivery(shoppingCartGoodsResponseVo.getIsDiscountDelivery());
         shoppingCartGoodsDto.setDiscountDeliveryActivityCode(shoppingCartGoodsResponseVo.getDiscountDeliveryActivityCode());
+        //总计价
+        shoppingCartGoodsDto.setPackageAmount(shoppingCartGoodsResponseVo.getNewPackAmount());
+        shoppingCartGoodsDto.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount());
+        shoppingCartGoodsDto.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount());
+        shoppingCartGoodsDto.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount());
     }
 
     /**