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

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

@@ -380,6 +380,8 @@ public class CalculationCommonService {
                     goods.setActivityDiscountsDtos(smDiscount);
                 }
                 materialList.add(goods);
+                cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice() + goods.getOriginalPrice());
+                cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() + goods.getTotalDiscountAmount());
             }
             cartGoodsDetailDto.setProductType(ProductType.MATERIAL.getCode());
             cartGoodsDetailDto.setMaterialList(materialList);