sunyu::update::update about switchCartGodos

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

@@ -1030,6 +1030,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         // 获取原门店购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, fromStoreId, userId, sessionId, "", shoppingCartBaseService);
+        log.info("【switchCardGoods】原门店数据:{}",JSONObject.toJSONString(cartGoodsList));
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (CollectionUtils.isEmpty(cartGoodsList)) {
             return ResponseUtil.success(shoppingCartGoodsResponseVo);
@@ -1049,62 +1050,32 @@ public class ShoppingCartMCoffeeServiceImpl {
             for (CartGoods cartGoods : cartGoodsList) {
                 onlyCheckGoodsList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(cartGoods)));
             }
-        }else{
-            // 新门店check购物车中所有商品
-            List<CartGoods> temList = new ArrayList<>();
-            for (CartGoods goods : cartGoodsList) {
-                temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
-            }
-            cartGoodsList = temList;
-        }
-
-        if (requestVo.getOperationType() == ShoppingCartOperationType.CHECK.getCode()) {
+            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);
                 return ResponseUtil.success(shoppingCartGoodsResponseVo);
-            }else {
-                //清除当前用户的代金券缓存，防止切换门店券数据带到不适用门店
-                com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = assortmentSdkService.getCartParamDto(partnerId, fromStoreId, userId);
-                shoppingCartBaseService.clearMCCafeCouponByType(cartParamDto, SaveCouponType.COUPON.getCode(),LogThreadLocal.getTrackingNo());
-
-                // 新门店check购物车中所有商品
-                List<CartGoods> temList = new ArrayList<>();
-                for (CartGoods goods : cartGoodsList) {
-                    temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
-                }
-                cartGoodsList = temList;
-
-
-                // 重新存储新门店购物车
-                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);
-                //设置更新响应信息
-                setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
-                shoppingCartGoodsResponseVo.setChanged(false);
             }
-        }
-        // 新门店check购物车中所有商品
-        if (requestVo.getOperationType() == ShoppingCartOperationType.CONFIRM.getCode()) {
+        }else {
+            // 新门店check购物车中所有商品
+            List<CartGoods> temList = new ArrayList<>();
+            for (CartGoods goods : cartGoodsList) {
+                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);
+            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);
+                    cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo, null);
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
             shoppingCartGoodsResponseVo.setChanged(false);