Merge remote-tracking branch 'origin/master_back' into master_back

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

@@ -244,14 +244,33 @@ public class ShoppingCartMCoffeeServiceImpl {
                     //使用券的是，如果购物车已经存在这个券，先清除，再添加
                     cartGoods.setQty(0);
                 }
-                if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && goodsId.equals(cartGoods.getSkuId()) && StringUtils.isBlank(cartGoods.getCouponCode()) && isContinue) {
+                if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
+                        && goodsId.equals(cartGoods.getSkuId()) && StringUtils.isBlank(cartGoods.getCouponCode())) {
                     // 如果购物车商品存在商品规格，替换时复制规格信息
                     if (CollectionUtils.isNotEmpty(cartGoods.getSpecialExtra())) {
                         addShoppingCartGoodsRequestVo.setSpecialExtra(cartGoods.getSpecialExtra());
                     }
                     if (cartGoods.getQty() > 1 ){
                         cartGoods.setQty(cartGoods.getQty() - 1);
-                    }else {
+                    } else {
+                        //如果购物车存在相同的商品，则先删除购物车商品，在新增商品券购物车行
+                        cartGoods.setQty(0);
+                    }
+                    isContinue= false;
+                }
+                if(StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
+                        && cartGoods.getName().equals("啡常搭") && cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType())
+                        && CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && cartGoods.getProductComboList().size() == 1
+                        && cartGoods.getProductComboList().get(0).getSkuId().equals(goodsId)
+                        && CollectionUtils.isNotEmpty(cartGoods.getProductGroupList()) && cartGoods.getProductGroupList().size() == 1
+                        && cartGoods.getProductGroupList().get(0).getSkuId().equals("0") && cartGoods.getProductGroupList().get(0).getSkuName().equals("无")) {
+                    // 如果购物车商品存在商品规格，替换时复制规格信息
+                    if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList().get(0).getSpecialExtra())) {
+                        addShoppingCartGoodsRequestVo.setSpecialExtra(cartGoods.getProductComboList().get(0).getSpecialExtra());
+                    }
+                    if (cartGoods.getQty() > 1 ){
+                        cartGoods.setQty(cartGoods.getQty() - 1);
+                    } else {
                         //如果购物车存在相同的商品，则先删除购物车商品，在新增商品券购物车行
                         cartGoods.setQty(0);
                     }