sunyu::update::补充新拉分支遗漏的代码

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

@@ -304,8 +304,10 @@ public class ShoppingCartMCoffeeServiceImpl {
                     }
                     coupons.add(calculationDiscountCoupon);
                 }
-                if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(cartGoods.getCouponCode())) {
-                    //使用券的是，如果购物车已经存在这个券，先清除，再添加
+
+                //使用券的是，如果购物车已经存在这个券，先清除，再添加
+                //过滤月享卡种子券
+                if (StringUtils.isNotEmpty(couponCode) && couponCode.equals(cartGoods.getCouponCode()) && Objects.equals(0,cartGoods.getIsSeedCouponGoods())) {
                     cartGoods.setQty(0);
                 }
                 if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
@@ -318,7 +320,9 @@ public class ShoppingCartMCoffeeServiceImpl {
                         cartGoods.setQty(cartGoods.getQty() - 1);
                     } else {
                         //如果购物车存在相同的商品，则先删除购物车商品，在新增商品券购物车行
-                        cartGoods.setQty(0);
+                        if (Objects.equals(0,cartGoods.getIsSeedCouponGoods())){
+                            cartGoods.setQty(0);
+                        }
                     }
                     isContinue= false;
                 }
@@ -1849,6 +1853,9 @@ public class ShoppingCartMCoffeeServiceImpl {
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon calculationDiscountCoupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                     calculationDiscountCoupon.setCode(cartGoods.getCouponCode());
                     calculationDiscountCoupon.setIsSeedCouponGoods(cartGoods.getIsSeedCouponGoods());
+                    if (cartGoods.getIsSeedCouponGoods()>0){
+                        calculationDiscountCoupon.setCartGoodsUid(cartGoods.getCartGoodsUid());
+                    }
                     coupons.add(calculationDiscountCoupon);
                 }
             }

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

@@ -212,6 +212,7 @@ public class CalculationServiceImpl {
                 activityDiscountsDto.setActivityCode(discount.getActivityCode());
                 activityDiscountsDto.setActivityName(discount.getActivityName());
                 activityDiscountsDto.setActivityType(discountType);
+                activityDiscountsDto.setCartGoodsUid(discount.getCartGoodsUid());
                 activityDiscountsDto.setDiscountAmount(0 - discountAmount);
                 activityDiscountsDto.setTenderId(discount.getTenderId());
                 activityDiscountsDto.setExtendType(discount.getExtendType());

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

@@ -211,7 +211,8 @@ public class CouponDiscountCalculation {
             cartGoods.setCustomerCode(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
             List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> list = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();
             if (CollectionUtils.isNotEmpty(list) && discount != null) {
-                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = list.stream().filter(t -> (ActivityTypeEnum.TYPE_32.getCode().equals(t.getType()) && mccafeUniversalCouponCode.equals(t.getActivityCode()))).findFirst().orElse(null);
+                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = list.stream()
+                        .filter(t -> ((ActivityTypeEnum.TYPE_32.getCode().equals(t.getType()) || ActivityTypeEnum.TYPE_37.getCode().equals(t.getType())) && mccafeUniversalCouponCode.equals(t.getActivityCode()))).findFirst().orElse(null);
                 if (goodsDiscount != null){
                     List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>();
                     ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();