同样优惠券不可用限制

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

@@ -86,6 +86,7 @@ public enum ResponseResult {
     SHOPPING_CART_COUPON_CAN_NOT_USE_THIS_SHOP("44020", "券不适用于该门店"),
     SHOPPING_CART_SEAT_EMPTY("44020", "键位为空"),
     SHOPPING_CART_COUPON_USED("44021", "优惠券已加入餐盘"),
+    SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE("44022", "已加入同样优惠券，第二张暂不可用"),
 
     /**
      * 订单状态码

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

@@ -134,7 +134,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         //商品券已添加情况校验
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode);
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId);
         CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo, goodsId);
         setClassificationAndPrice(addCartGoods, productBeanListSpuClass);
         //查询多个商品库存信息
@@ -175,7 +175,7 @@ public class ShoppingCartMCoffeeServiceImpl {
     }
 
 
-    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode) {
+    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode,String goodsId) {
         if (operationType != null && operationType == 1 && StringUtils.isBlank(couponCode)) {
             throw new ServiceException(ResponseResult.PARAMETER_MISSING, "商品券券号为空");
         }
@@ -191,9 +191,13 @@ public class ShoppingCartMCoffeeServiceImpl {
                     calculationDiscountCoupon.setCode(cartGoods.getCouponCode());
                     coupons.add(calculationDiscountCoupon);
                 }
-                if (couponCode != null && couponCode.equals(cartGoods.getCouponCode())) {
+                if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(cartGoods.getCouponCode())) {
                     throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_USED);
                 }
+                //同样商品券不能使用
+                if (StringUtils.isNotEmpty(couponCode)&& StringUtils.isNotEmpty(cartGoods.getCouponCode()) && goodsId.equals(cartGoods.getGoodsId())) {
+                    throw new ServiceException(ResponseResult.SHOPPING_CART_GOODS_COUPON_CAN_NOT_USE);
+                }
             }
         }
         //新增商品券