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

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

@@ -113,7 +113,7 @@ public class CalculationCommonService {
                     original += choice.getOriginalPrice() * cartGoods.getQty();
                 } else {
                     amount += mt.getRealAmount();
-                    original += mt.getOriginalPrice() * cartGoods.getQty();
+                    original += choice.getFinalPrice() * cartGoods.getQty();
                     choice.setAmount(mt.getRealAmount().longValue());
                     choice.setOriginalAmount(original);
                 }

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

@@ -211,7 +211,7 @@ public class CalculationSharingDiscountService {
                 CalculationSharingDiscountRequestDto.CalculationDiscountGoods.Material material = new CalculationSharingDiscountRequestDto.CalculationDiscountGoods.Material();
                 material.setType(2);
                 material.setGoodsId(group.getGoodsId());
-                material.setGoodsQuantity(cartGoods.getQty());
+                material.setGoodsQuantity(group.getQty());
                 material.setOriginalPrice(group.getFinalPrice());
                 groups.add(material);
             }