购物车查询增加买一赠一寄杯活动

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/CalculationSharingDiscountResponseDto.java

@@ -392,6 +392,21 @@ public class CalculationSharingDiscountResponseDto {
                  * 赠送商品数量
                  */
                 private Integer sendNumber;
+
+                /**
+                 *  可兑换商品券编号
+                 */
+                private String sendCouponCode;
+
+                /**
+                 *  可兑换商品券名称
+                 */
+                private String sendCouponName;
+
+                /**
+                 *  是否已选择寄杯
+                 */
+                private Boolean sendCoupon ;
             }
         }
 

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

@@ -154,5 +154,38 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      */
     private List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods;
 
+    /**
+     * 用户可以选择的商品
+     */
+    private List<chooseGood> chooseGoods;
+
+    @Data
+    public static class chooseGood {
+
+
+        /**
+         * 活动类型
+         */
+        private Integer activeType;
+
+        /**
+         * 赠送商品名称
+         */
+        private String goodsName;
+
+        /**
+         * 可兑换商品券编号
+         */
+        private String couponCode ;
+
+        /**
+         *  可兑换商品券名称
+         */
+        private String couponName ;
 
+        /**
+         *  是否已选择寄杯
+         */
+        private Boolean sendCoupon;
+    }
 }

shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -39,6 +39,7 @@ public enum ActivityTypeEnum {
     TYPE_6(6, "买M赠N"),
     TYPE_61(61, "单品买M赠N"),
     TYPE_62(62, "买赠"),
+    TYPE_63(63, "买一赠一寄杯"),
     TYPE_7(7, "满额赠券"),
     TYPE_8(8, "满N件换购"),
     /**

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

@@ -51,6 +51,9 @@ public class CalculationSharingCartService {
     @Autowired
     private CalculationCommonService calculationCommonService;
 
+    @Autowired
+    private BuyOneGiveOneSendService buyOneGiveOneSendService;
+
     /**
      * 响应购物车价格计算依赖促销
      */
@@ -109,5 +112,10 @@ public class CalculationSharingCartService {
             calculationCommonService.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
         }
 
+        /**
+         * 买一赠一寄杯
+         */
+        buyOneGiveOneSendService.giftResponse(discountResult, cartGoodsList, shoppingCartInfoRequestVo, activityQueryDto,shoppingCartGoodsResponseVo);
+
     }
 }