订单商品是商品券优惠，返回优惠信息

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -234,7 +234,7 @@ public class CalculationServiceImpl {
 //        couponPromotionVO.setOrderType(orderType);
 //        couponPromotionVO.setFlg(CouponFlag.YES.getCode());
         //优惠券
-        couponDiscountCalculation.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto,premiumExchangeActivity,shoppingCartInfoRequestVo);
+        couponDiscountCalculation.updateShoppingCartGoodsApportion(calculationDiscountResult, shoppingCartGoodsDto);
 
         setMealCalculation.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto);
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -3,7 +3,7 @@ package cn.freemud.service.impl.mcoffee.calculation;
 import cn.freemud.adapter.CouponAdapter;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.entities.dto.*;
-import cn.freemud.entities.dto.activity.ActivityQueryDto;
+import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
@@ -112,8 +112,28 @@ public class CouponDiscountCalculation {
     /**
      * 商品均摊
      */
-    public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo){
-
+    public void updateShoppingCartGoodsApportion(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto){
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponDiscounts = calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getCouponDiscounts();
+
+        for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
+            if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) {
+                List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>();
+                for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponDiscount : couponDiscounts) {
+                    if(couponDiscount.getCouponCode().equals(cartGoods.getCouponCode())){
+                        ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+                        activityDiscountsDto.setActivityCode(couponDiscount.getCouponCode());
+                        activityDiscountsDto.setActivityName(couponDiscount.getCouponCode());
+                        activityDiscountsDto.setActivityType(couponDiscount.getActivityType());
+                        activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscountAmount());
+                        productActivityDiscountsDtos.add(activityDiscountsDto);
+
+                        cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
+                        cartGoods.setSalePrice(0L);
+                        cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos);
+                    }
+                }
+            }
+        }
     }
 
     public void  getCoupon(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo){