sunyu::update::fix bug about clear couponInfo for switchCartGoods method

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

@@ -965,6 +965,8 @@ public class ShoppingCartMCoffeeServiceImpl {
                     break;
                 }
             }
+            //清空商品券商品
+            clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
         }
 
         List<CartGoods> onlyCheckGoodsList = new ArrayList<>();
@@ -988,8 +990,6 @@ public class ShoppingCartMCoffeeServiceImpl {
                 shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
                 shoppingCartInfoRequestVo.setShopId(requestVo.getFromShopId());
                 setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.ADD_AND_UPDATE, shoppingCartInfoRequestVo);
-                //清空商品券商品
-                clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
                 // 重新存储新门店购物车
                 assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
                 return ResponseUtil.success(shoppingCartGoodsResponseVo);
@@ -1005,9 +1005,6 @@ public class ShoppingCartMCoffeeServiceImpl {
                 }
                 cartGoodsList = temList;
 
-                //清空商品券商品
-                clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
-
                 // 重新存储新门店购物车
                 assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
 
@@ -1024,9 +1021,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
         // 新门店check购物车中所有商品
         if (requestVo.getOperationType() == ShoppingCartOperationType.CONFIRM.getCode()) {
-            //清空商品券商品
-            clearCartCouponGoods(partnerId, toStoreId, userId, sessionId, cartGoodsList);
-
             // 重新存储新门店购物车
             assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
 
@@ -1050,10 +1044,11 @@ 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())).collect(Collectors.toList());
         //如果购物车商品剔除商品券商品后列表为空，则清空缓存信息
         if (CollectionUtils.isEmpty(cartGoodsList)){
             com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = assortmentSdkService.getCartParamDto(partnerId, storeId, userId);
+            log.info("clearCouponInfo:{}",JSONObject.toJSONString(cartParamDto));
             shoppingCartBaseService.clearMCCafe(cartParamDto, LogThreadLocal.getTrackingNo());
         }else{
             // 重新存储新门店购物车