过滤问题

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

@@ -366,7 +366,8 @@ public class ShoppingCartMCoffeeServiceImpl {
 
                 //使用券的是，如果购物车已经存在这个券，先清除，再添加
                 //过滤月享卡种子券
-                if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(cartGoods.getCouponCode()) && Objects.equals(0,cartGoods.getIsMonthCardGoods())) {
+                if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(cartGoods.getCouponCode())
+                        && Objects.equals(0,cartGoods.getIsMonthCardGoods()) && Objects.equals(0,cartGoods.getIsB3S1CouponGoods())) {
                     cartGoods.setQty(0);
                 }
                 if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
@@ -379,7 +380,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                         cartGoods.setQty(cartGoods.getQty() - 1);
                     } else {
                         //如果购物车存在相同的商品，则先删除购物车商品，在新增商品券购物车行
-                        if (Objects.equals(0,cartGoods.getIsMonthCardGoods())){
+                        if (Objects.equals(0,cartGoods.getIsMonthCardGoods()) && Objects.equals(0,cartGoods.getIsB3S1CouponGoods())){
                             cartGoods.setQty(0);
                         }
                     }