sunyu::update::移除商品券门槛逻辑

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

@@ -433,17 +433,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
                 cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
-
-        // 促销算价若未返回优惠信息有可能会变更购物车数据，重新存储最新购物车,并进行新一次的算价
-        if (null != shoppingCartGoodsResponseVo.getChanged() &&shoppingCartGoodsResponseVo.getChanged()) {
-            assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
-            // 促销活动的优惠金额计算
-            calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
-                    cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
-            if (shoppingCartGoodsResponseVo.getChanged() && StringUtils.isEmpty(shoppingCartGoodsResponseVo.getToastMsg())){
-                shoppingCartGoodsResponseVo.setChanged(false);
-            }
-        }
         //把月卡放到最后
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {
             int size = cartGoodsList.size();

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

@@ -79,18 +79,6 @@ public class CouponDiscountCalculation {
         if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())
                 || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
                 ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType()))))){
-            //订单级别优惠为空，则清除商品券信息，并且移除用券商品，更新商品价格
-            if (null != calculationDiscountResult && CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())){
-                Iterator<CartGoods> cartGoodsIterator = cartGoodsList.iterator();
-                while (cartGoodsIterator.hasNext()){
-                    if (StringUtils.isNotEmpty(cartGoodsIterator.next().getCouponCode())) {
-                        cartGoodsIterator.remove();
-                        //价格变动
-                        shoppingCartGoodsResponseVo.setChanged(true);
-                        break;
-                    }
-                }
-            }
             return;
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
@@ -151,14 +139,6 @@ public class CouponDiscountCalculation {
                 if (CollectionUtils.isNotEmpty(discountsNew)) {
                     ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discountsNew.stream().filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())).findFirst().get();
                     cartGoods.setCouponName(goodsDiscount.getActivityName());
-                }else{
-                    Iterator<CartGoods> cartGoodsIterator = cartGoodsList.iterator();
-                    while (cartGoodsIterator.hasNext()){
-                        if (StringUtils.isNotEmpty(cartGoodsIterator.next().getCouponCode())) {
-                            cartGoodsIterator.remove();
-                            break;
-                        }
-                    }
                 }
             }
         }