fix

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

@@ -99,11 +99,12 @@ public class CouponPromotionService implements IPromotionService {
         if (MapUtils.isNotEmpty(validCouponMap) && MapUtils.isNotEmpty(spqIdToCartUuid) && calculationDiscountResult != null){
             List<String> activityCodeList = calculationDiscountResult.getDiscounts().stream().map(p -> p.getActivityCode()).collect(Collectors.toList());
             for (String spqId : validCouponMap.keySet()) {
-                if (!activityCodeList.contains(spqId)){ // 表示商品券不够启用金额
-                    List<String> uuidList = spqIdToCartUuid.get(spqId);
+                CheckSpqInfoResponseDto sqpInfo = validCouponMap.get(spqId);
+                if (!activityCodeList.contains(sqpInfo.getCouponCode())){ // 表示商品券不够启用金额
+                    List<String> uuidList = spqIdToCartUuid.get(sqpInfo.getCouponCode());
                     if (CollectionUtils.isNotEmpty(uuidList)){
                         List<CartGoods> newCartList = cartGoodsList.stream().filter(p -> !uuidList.contains(p.getCartGoodsUid())).collect(Collectors.toList());
-                        assortmentSdkService.setShoppingCart(shoppingCartInfoRequestVo.getPartnerId(), shoppingCartInfoRequestVo.getShopId(), userLoginInfoDto.getMemberId(), newCartList, null, null, this.shoppingCartBaseService);
+                        assortmentSdkService.setShoppingCart(activityQueryDto.getPartnerId(), activityQueryDto.getStoreId(), userLoginInfoDto.getMemberId(), newCartList, null, null, this.shoppingCartBaseService);
                         CheckSpqInfoResponseDto checkSpqInfoResponseDto = validCouponMap.get(spqId);
                         shoppingCartGoodsResponseVo.setChanged(true);
                         shoppingCartGoodsResponseVo.setToastMsg("当前购物车金额低于【" + checkSpqInfoResponseDto.getCouponName() + "】优惠券起用金额门槛，券已自动移除购物车");

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

@@ -371,7 +371,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , ShoppingCartConstant.ADD_AND_UPDATE
                     , partnerId
                     , null
-                    , userId);
+                    , userId
+                    , storeId);
 
             buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,discountResult,null,partnerId);
         }
@@ -498,7 +499,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , ShoppingCartConstant.ADD_AND_UPDATE
                     , partnerId
                     , null
-                    , userId);
+                    , userId
+                    , storeId);
 
             buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,discountResult,null,partnerId);
         }
@@ -659,7 +661,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , ShoppingCartConstant.QUERY_INFO
                     , partnerId
                     ,shoppingCartInfoRequestVo.getFlag()
-                    , userId);
+                    , userId
+                    , storeId);
 
             buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,calculationSharingDiscountResult,shoppingCartInfoRequestVo.getFlag(),partnerId);
         }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingCartService.java

@@ -69,7 +69,8 @@ public class CalculationSharingCartService {
             , String opt
             , String partnerId
             , Integer flag
-            , String userId) {
+            , String userId
+            , String storeId) {
 
         /**
          * 用促销价格初始化购物车行记录成交价
@@ -79,7 +80,7 @@ public class CalculationSharingCartService {
         /**
          * 可用券及券折扣
          */
-        promotionSharingService.updateShoppingCartGoodsDiscount(discountResult, cartGoodsList, shoppingCartGoodsResponseVo, couponPromotionVO,shoppingCartInfoRequestVo, userId);
+        promotionSharingService.updateShoppingCartGoodsDiscount(discountResult, cartGoodsList, shoppingCartGoodsResponseVo, couponPromotionVO,shoppingCartInfoRequestVo, userId, partnerId, storeId);
 
         /**
          * 满减处理

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java

@@ -51,7 +51,7 @@ public class CouponSharingService {
             , List<CartGoods> cartGoodsList
             , ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo
             , CouponPromotionVO couponPromotionVO
-            ,ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, String userId) {
+            ,ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, String userId, String partnerId, String storeId) {
         // 用户选择了查询优惠券信息
         if (couponPromotionVO != null && ObjectUtils.equals(CouponFlag.YES.getCode(), couponPromotionVO.getFlg())) {
             List<CartGoods> tmpCartGoods = cartGoodsList.parallelStream().filter(k -> k.getCartGoodsUid()
@@ -103,7 +103,7 @@ public class CouponSharingService {
                     List<String> uuidList = spqIdToCartUuid.get(sqpInfo.getCouponCode());
                     if (CollectionUtils.isNotEmpty(uuidList)){
                         List<CartGoods> newCartList = cartGoodsList.stream().filter(p -> !uuidList.contains(p.getCartGoodsUid())).collect(Collectors.toList());
-                        assortmentSdkService.setShoppingCart(shoppingCartInfoRequestVo.getPartnerId(), shoppingCartInfoRequestVo.getShopId(), userId, newCartList, null, null, this.shoppingCartBaseService);
+                        assortmentSdkService.setShoppingCart(partnerId, storeId, userId, newCartList, null, null, this.shoppingCartBaseService);
                         CheckSpqInfoResponseDto checkSpqInfoResponseDto = validCouponMap.get(spqId);
                         shoppingCartGoodsResponseVo.setChanged(true);
                         shoppingCartGoodsResponseVo.setToastMsg("当前购物车金额低于【" + checkSpqInfoResponseDto.getCouponName() + "】优惠券起用金额门槛，券已自动移除购物车");