买3赠1券

shopping-cart-application-service/src/main/java/cn/freemud/controller/MCoffeeShoppingCartController.java

@@ -86,8 +86,8 @@ public class MCoffeeShoppingCartController {
      */
     @ApiAnnotation(logMessage = "removeB3S1Coupon")
     @PostMapping(value = "/removeB3S1Coupon")
-    public BaseResponse deleteB3S1Coupon(@Validated @LogParams @RequestBody MCoffeeAddGoodsRequestVo request) {
-        return shoppingCartMCoffeeService.addGoods(request);
+    public BaseResponse removeB3S1Coupon(@Validated @LogParams @RequestBody MCoffeeAddGoodsRequestVo request) {
+        return shoppingCartMCoffeeService.removeB3S1Coupon(request);
     }
 
 

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

@@ -49,6 +49,11 @@ public class BatchOperateCartGoodsRequestVo extends BaseRequestVo{
     private String redundancyCouponCode;
 
     /**
+     * 根据券号清除当前购物车中月卡及商品信息
+     */
+    private String redundancyB3S1CouponCode;
+
+    /**
      * 是否使用月享卡2.0
      * 1 是
      * 0 否

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

@@ -244,6 +244,10 @@ public class CartGoods {
      */
     private int isB3S1Coupon = 0;
     /**
+     * 是否使用了买3赠1券
+     */
+    private int isB3S1CouponGoods = 0;
+    /**
      * 是否是太阳蛋商品
      */
     private int isSunnyCoupon=0;

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

@@ -82,7 +82,7 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      * 1 是
      * 0 否
      */
-    private Integer isUseB3S3Coupon = 1;
+    private Integer isUseB3S1Coupon = 1;
     /**
      * 优惠券对应的活动号
      */

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

@@ -167,6 +167,7 @@ public class CouponDiscountCalculation {
         List<CartGoods> newCartGoodsList = new ArrayList<>();
         for (int i = 0; i < cartGoodsList.size(); i++) {
             CartGoods cartGoods = cartGoodsList.get(i);
+            cartGoods.setIsB3S1CouponGoods(0);
             if("9998".equals(cartGoods.getSkuId())) {
                 continue;
             }
@@ -204,6 +205,7 @@ public class CouponDiscountCalculation {
                     cartGoods.setQty(b3S1DiscountOptional.get().getActualGoodsNumber());
                     cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName());
                     cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode());
+                    cartGoods.setIsB3S1Coupon(1);
                     CartGoods cartGoodsNew = new CartGoods();
                     BeanUtils.copyProperties(cartGoods, cartGoodsNew);
                     cartGoodsNew.setCartGoodsUid(UUID.randomUUID().toString());