删除月享卡商品

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

@@ -1068,7 +1068,12 @@ public class ShoppingCartMCoffeeServiceImpl {
                 shoppingCartInfoRequestVo.setShopId(requestVo.getFromShopId());
                 setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
                 // 重新存储新门店购物车
-                assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
+                if(CollectionUtils.isNotEmpty(cartGoodsList)) {
+                    assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
+                } else {
+                    com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = assortmentSdkService.getCartParamDto(partnerId, toStoreId, userId);
+                    shoppingCartBaseService.clear(cartParamDto, LogThreadLocal.getTrackingNo());
+                }
                 return ResponseUtil.success(shoppingCartGoodsResponseVo);
             }
         }else {
@@ -1085,7 +1090,12 @@ public class ShoppingCartMCoffeeServiceImpl {
             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);
+            if(CollectionUtils.isNotEmpty(cartGoodsList)) {
+                assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
+            } else {
+                com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = assortmentSdkService.getCartParamDto(partnerId, toStoreId, userId);
+                shoppingCartBaseService.clear(cartParamDto, LogThreadLocal.getTrackingNo());
+            }
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
             shoppingCartGoodsResponseVo.setChanged(false);