sunyu::update::update about switchCartGoods

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

@@ -1042,6 +1042,9 @@ public class ShoppingCartMCoffeeServiceImpl {
                     break;
                 }
             }
+
+            //清空商品券商品
+            clearCartCouponGoods(partnerId, fromStoreId, userId, sessionId, cartGoodsList);
         }
 
         List<CartGoods> onlyCheckGoodsList = new ArrayList<>();
@@ -1050,12 +1053,13 @@ public class ShoppingCartMCoffeeServiceImpl {
             for (CartGoods cartGoods : cartGoodsList) {
                 onlyCheckGoodsList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(cartGoods)));
             }
-            log.info("【SwitchCartGoods】校验门店数据结果:{}",JSONObject.toJSONString(shoppingCartGoodsResponseVo));
             if (StringUtils.isNotEmpty(shoppingCartGoodsResponseVo.getToastMsg())){
                 //设置更新响应信息,校验失败只弹框提示消息，不切换门店，故将门店id重置为原来门店
                 shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
                 shoppingCartInfoRequestVo.setShopId(requestVo.getFromShopId());
                 setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
+                // 重新存储新门店购物车
+                assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
                 return ResponseUtil.success(shoppingCartGoodsResponseVo);
             }
         }else {
@@ -1065,17 +1069,14 @@ public class ShoppingCartMCoffeeServiceImpl {
                 temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
             }
             cartGoodsList = temList;
-            log.info("【SwitchCartGoods】校验门店数据结果:{}",JSONObject.toJSONString(shoppingCartGoodsResponseVo));
-            // 重新存储新门店购物车
-            assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
-            //清空商品券商品
-            clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
             // 当couponCode不为空时，需参与价格计算
             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList, null, null);
 
             // 促销活动的优惠金额计算
             calculationService.updateShoppingCartGoodsDiscount(partnerId, toStoreId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
                     cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo, null);
+            // 重新存储新门店购物车
+            assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
             shoppingCartGoodsResponseVo.setChanged(false);
@@ -1090,8 +1091,9 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isEmpty(cartGoodsList)) {
             return;
         }
-        cartGoodsList = cartGoodsList.stream().filter(cartGoods -> cartGoods.getCouponCode() == null).collect(Collectors.toList());
-        // 重新存储新门店购物车
+        cartGoodsList = cartGoodsList.stream().filter(cartGoods -> StringUtils.isEmpty(cartGoods.getCouponCode())
+                && !StringUtils.equals("9999",cartGoods.getSkuId())).collect(Collectors.toList());
+        // 重新存储门店购物车
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
     }