fix 商品券,相同商品的处理

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

@@ -226,6 +226,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(oldCartGoodsList)) {
+            Boolean isContinue =true;
             for (CartGoods cartGoods : oldCartGoodsList) {
                 //购物车已存在商品券
                 if (StringUtils.isNotBlank(cartGoods.getCouponCode())) {
@@ -237,7 +238,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                     //使用券的是，如果购物车已经存在这个券，先清除，再添加
                     cartGoods.setQty(0);
                 }
-                if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && goodsId.equals(cartGoods.getSkuId()) && StringUtils.isBlank(cartGoods.getCouponCode())) {
+                if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && goodsId.equals(cartGoods.getSkuId()) && StringUtils.isBlank(cartGoods.getCouponCode()) && isContinue) {
                     // 如果购物车商品存在商品规格，替换时复制规格信息
                     if (CollectionUtils.isNotEmpty(cartGoods.getSpecialExtra())) {
                         addShoppingCartGoodsRequestVo.setSpecialExtra(cartGoods.getSpecialExtra());
@@ -248,6 +249,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                         //如果购物车存在相同的商品，则先删除购物车商品，在新增商品券购物车行
                         cartGoods.setQty(0);
                     }
+                    isContinue= false;
                 }
                 //同样商品券不能使用
                /* if (StringUtils.isNotEmpty(couponCode)&& StringUtils.isNotEmpty(cartGoods.getCouponCode()) && goodsId.equals(cartGoods.getGoodsId())) {