将促销返回的活动返回给前端

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -12,6 +12,7 @@
  */
 package cn.freemud.entities.vo;
 
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import lombok.Builder;
 import lombok.Data;
 
@@ -141,4 +142,8 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      */
     private Long payCardFee;
 
+    /**
+     * 总的优惠信息集合
+     */
+    private List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts;
 }

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

@@ -349,6 +349,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             clearMsg(shoppingCartGoodsResponseVo, cartGoods.getCartGoodsUid());
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, allCartGoodsList, null, partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
+
+            // 将促销返回的总的活动信息返回给前端
+            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts());
         }
         //埋点添加购物车行为
         this.buriedPointShoppingCart(addShoppingCartGoodsRequestVo, spuId, productName);
@@ -468,6 +471,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             clearMsg(shoppingCartGoodsResponseVo, cartGoodsUid);
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
+
+            // 将促销返回的总的活动信息返回给前端
+            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts());
         }
 
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
@@ -624,6 +630,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
             // 在原价、现价、折扣价上增加第一次使用会员卡的费用
             this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
+
+            // 将促销返回的总的活动信息返回给前端
+            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult.getDiscounts());
+
         }
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }