麦咖啡咖啡月卡开发

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

@@ -88,6 +88,10 @@ public class ActivityCalculationDiscountRequestDto {
          */
         private String goodsCode;
         /**
+         * 商品核销券号
+         */
+        private String couponCode;
+        /**
          * 商品ID
          */
         private String goodsId;

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

@@ -115,4 +115,18 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
         private String ruleId;
     }
 
+    /**
+     * 万能券、咖啡月卡券
+     */
+    private String coffeeCouponCode;
+    /**
+     *
+     */
+    private String coffeeCouponName;
+
+    /**
+     * 咖啡月卡适用商品id
+     */
+    private List<String> goodsId;
+
 }

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

@@ -87,6 +87,7 @@ public enum ResponseResult {
     SHOPPING_CART_SEAT_EMPTY("44020", "键位为空"),
     SHOPPING_CART_COUPON_USED("44021", "优惠券已加入餐盘"),
     SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE("44022", "已加入同样优惠券，第二张暂不可用"),
+    SHOPPING_CART_GOODS_CHECK_ERROR("44023", "当前餐盘中没有可用券的饮品"),
 
     /**
      * 订单状态码

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

@@ -303,6 +303,27 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {
             // check购物车中所有商品
             cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+
+            //校验咖啡月卡的商品是否在购物车里面存在
+            List<String> goodsId = shoppingCartInfoRequestVo.getGoodsId();
+            if (CollectionUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(shoppingCartInfoRequestVo.getCoffeeCouponCode())){
+                List<CartGoods> cartGoodsListNew =new ArrayList<>();
+                for (String id: goodsId ) {
+                    List<CartGoods> CartGoodsList = cartGoodsList.stream().filter(t -> t.getGoodsId().equals(id)).collect(Collectors.toList());
+                    cartGoodsListNew.addAll(CartGoodsList);
+                }
+                if (CollectionUtils.isEmpty(cartGoodsListNew)){
+                    return ResponseUtil.error(ResponseResult.SHOPPING_CART_GOODS_CHECK_ERROR);
+                }
+                CartGoods cartGoods = cartGoodsListNew.stream().max(Comparator.comparing(CartGoods::getOriginalPrice)).get();
+                for (CartGoods cart:  cartGoodsList ) {
+                    if (cart.getCartGoodsUid().equals(cartGoods.getCartGoodsUid())){
+                        cart.setCategoryName(shoppingCartInfoRequestVo.getCoffeeCouponName());
+                        cart.setCouponCode(shoppingCartInfoRequestVo.getCoffeeCouponCode());
+                    }
+                }
+            }
+
             // 重新存储最新购物车
             assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
         }
@@ -318,7 +339,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
 
-
     /**
      * 查询购物车可用券
      */

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

@@ -365,6 +365,8 @@ public class CalculationServiceImpl {
         calculationDiscountGoods.setGoodsQuantity(goodsQuantity);
         calculationDiscountGoods.setOriginalPrice(originalPrice);
         calculationDiscountGoods.setMemberDiscount(memberDiscount);
+        //新增咖啡月卡券券号
+        calculationDiscountGoods.setCouponCode(cartGoods.getCouponCode());
 
 
         //可选搭配