fix 随单购合并代码

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

@@ -447,10 +447,10 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCartForCoupon(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), "", shoppingCartBaseService);
         // 当couponCode不为空时，需参与价格计算
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(null, null, cartGoodsList,null);
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(null, null, cartGoodsList,null,null);
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), requestVo.getAppId(), requestVo.getOrderType(), assortmentCustomerInfoVo.isMemberPaid(), requestVo.getMenuType(), requestVo.getReceiveId(), null,
-        cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
+        cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
         String moneyCoupon = assortmentSdkService.getShoppingCartCoupon(requestVo.getPartnerId(),
                 requestVo.getStoreId(), requestVo.getUserId(), shoppingCartBaseService,SaveCouponType.COUPON.getCode());
         String deliveryFeeCoupon = assortmentSdkService.getShoppingCartCoupon(requestVo.getPartnerId(),requestVo.getStoreId(),requestVo.getUserId(),shoppingCartBaseService,SaveCouponType.FREIGHT_COUPON.getCode());
@@ -681,7 +681,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 //清空商品券商品
                 clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
                 // 当couponCode不为空时，需参与价格计算
-                List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,null);
+                List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,null,null);
 
                 // 促销活动的优惠金额计算
                 calculationService.updateShoppingCartGoodsDiscount(partnerId, toStoreId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
@@ -698,7 +698,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             //清空商品券商品
             clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
             // 当couponCode不为空时，需参与价格计算
-            List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,null);
+            List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,null,null);
 
             // 促销活动的优惠金额计算
             calculationService.updateShoppingCartGoodsDiscount(partnerId, toStoreId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
@@ -1551,11 +1551,11 @@ public class ShoppingCartMCoffeeServiceImpl {
             }
         }
         // 当couponCode不为空时，需参与价格计算
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,null);
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,null,null);
 
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
-                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
+                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
         //设置更新响应信息
         ShoppingCartInfoRequestVo shoppingCartInfoRequestVo =new ShoppingCartInfoRequestVo();
         BeanUtil.convertBean(cardAddVo,shoppingCartInfoRequestVo);

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

@@ -127,9 +127,9 @@ public class CouponDiscountCalculation {
                     continue;
                 }
                 cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
-                List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discounts = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();
-                if (CollectionUtils.isNotEmpty(discounts)) {
-                    ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discounts.stream().filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())).findFirst().get();
+                List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discountsNew = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();
+                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());
                 }
             }