合并冲突修改

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

@@ -135,7 +135,7 @@ public class CalculationCommonService {
         cartGoods.setFinalPrice(find.getNowPrice());
         // fix 免单情况，C端展示问题
         int activityNumber = 0;
-        for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : find.getDiscounts()) {
+        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount discount : find.getDiscounts()) {
             activityNumber += discount.getActualGoodsNumber();
         }
         cartGoods.setActivityNumber(activityNumber);