Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into develop

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java

@@ -27,4 +27,5 @@ public class CheckCartRequest {
     private Integer orderWay;
     private String trackingNo;
     private String tableNumber;
+    private String MenuType;
 }

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/GetProductInfoRequest.java

@@ -27,6 +27,6 @@ public class GetProductInfoRequest {
 
     String trackingNo;
 
-    String businessType;
+    String menuType;
 
 }

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -112,7 +112,7 @@ public interface ShoppingCartBaseService {
             getProductInfoDto.setShopId(getProductInfoRequest.getStoreId());
             getProductInfoDto.setProductInfoType(2);
             getProductInfoDto.setProductIds(goodsIds);
-            getProductInfoDto.setChannel(getProductInfoRequest.getBusinessType());
+            getProductInfoDto.setChannel(getProductInfoRequest.getMenuType());
             ProductService productService = SDKCommonBaseContextWare.getBean(ProductService.class);
             com.freemud.application.sdk.api.base.BaseResponse<ProductInfosDTO> productInfosDTOBaseResponse = productService.listProductInfoByIdList(getProductInfoDto, LogThreadLocal.getTrackingNo());
             if (!Objects.equals(ResponseResultEnum.SUCCESS.getCode(), productInfosDTOBaseResponse.getCode()) || productInfosDTOBaseResponse.getData() == null) {

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/AddGoodsByWeixinCardRequestVo.java

@@ -44,5 +44,5 @@ public class AddGoodsByWeixinCardRequestVo extends BaseRequestVo{
     /**
      * 业务类型： 0 : 自提 1：外卖 2：微商城
      */
-    private Integer businessType ;
+    private Integer menuType ;
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/AddShoppingCartGoodsRequestVo.java

@@ -70,6 +70,6 @@ public class AddShoppingCartGoodsRequestVo extends BaseRequestVo{
     /**
      * 业务类型： 0 : 自提 1：外卖 2：微商城
      */
-    private Integer businessType ;
+    private Integer menuType ;
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -85,7 +85,7 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
     /**
      * 业务类型： 0 : 自提 1：外卖 2：微商城
      */
-    private Integer businessType ;
+    private Integer menuType ;
 
     @Data
     public final static class SendGoods {

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/UpdateShoppingCartGoodsQtyRequestVo.java

@@ -46,6 +46,6 @@ public class UpdateShoppingCartGoodsQtyRequestVo extends BaseRequestVo {
     /**
      * 业务类型： 0 : 自提 1：外卖 2：微商城
      */
-    private Integer businessType ;
+    private Integer menuType ;
 
 }

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

@@ -98,7 +98,7 @@ public class AdditionalPromotionService implements IPromotionService {
         List<String> goodsIds = sendGoods.stream().map(ShoppingCartInfoRequestVo.SendGoods::getGoodsId).collect(Collectors.toList());
         Map<String, ShoppingCartInfoRequestVo.SendGoods> goodQtyMap = sendGoods.stream().collect(Collectors.toMap(ShoppingCartInfoRequestVo.SendGoods::getGoodsId, Function.identity(), (k1, k2) -> k1));
         List<ProductBeanDTO> productBeanList = assortmentSdkService.getProductsInfoSdk(shoppingCartInfoRequestVo.getPartnerId()
-                , shoppingCartInfoRequestVo.getShopId(), goodsIds,shoppingCartInfoRequestVo.getBusinessType(), shoppingCartBaseService);
+                , shoppingCartInfoRequestVo.getShopId(), goodsIds,shoppingCartInfoRequestVo.getMenuType(), shoppingCartBaseService);
         if (CollectionUtils.isEmpty(productBeanList)) {
             throw new ServiceException(ResponseResult.PREMIUM_EXCHANGE_ACTIVITY_NOT_EXIST);
         }

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

@@ -142,7 +142,7 @@ public class AssortmentSdkService {
      * @param orderType
      */
     public CheckCartRequest checkShoppingCartSdk(List<CartGoods> oldAllCartGoodsList, String partnerId, String storeId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo
-            , Integer orderType, String tableNumber, ShoppingCartBaseService shoppingCartService) {
+            , Integer orderType, String tableNumber, Integer menuType ,ShoppingCartBaseService shoppingCartService) {
         CheckCartRequest checkCartRequest = new CheckCartRequest();
         checkCartRequest.setCartGoodsList(JSONArray.parseArray(JSONObject.toJSONString(oldAllCartGoodsList), com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.class));
         checkCartRequest.setOrderWay(orderType);
@@ -151,6 +151,7 @@ public class AssortmentSdkService {
         checkCartRequest.setStoreId(storeId);
         checkCartRequest.setTableNumber(tableNumber);
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+        checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<CheckCartRequest> baseResponse ;
         if ("checkAllCartGoodsNew".equals(shoppingCartCheckAction)){
             baseResponse= shoppingCartService.checkAllCartGoodsNew(checkCartRequest);
@@ -171,13 +172,13 @@ public class AssortmentSdkService {
      * @param goodsIds
      * @return
      */
-    public List<ProductBeanDTO> getProductsInfoSdk(String partnerId, String storeId, List<String> goodsIds,Integer businessType, ShoppingCartBaseService shoppingCartService) {
+    public List<ProductBeanDTO> getProductsInfoSdk(String partnerId, String storeId, List<String> goodsIds,Integer menuType, ShoppingCartBaseService shoppingCartService) {
         GetProductInfoRequest request = new GetProductInfoRequest();
         request.setGoodsIds(goodsIds);
         request.setPartnerId(partnerId);
         request.setStoreId(storeId);
         request.setTrackingNo(LogThreadLocal.getTrackingNo());
-        request.setBusinessType(BusinessTypeEnum.getByType(businessType).getCode());
+        request.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<List<ProductBeanDTO>> baseResponse =
                 shoppingCartService.getProductsInfo(request);
         if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) {

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

@@ -55,7 +55,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList = new ArrayList<>();
         sendActivities.forEach(sendActivity -> sendGoodsList.addAll(sendActivity.getSendGoods()));
-        List<ProductBeanDTO> productBeanDTOS = buildActivityProduct(activityQueryDto, sendGoodsList,shoppingCartInfoRequestVo.getBusinessType());
+        List<ProductBeanDTO> productBeanDTOS = buildActivityProduct(activityQueryDto, sendGoodsList,shoppingCartInfoRequestVo.getMenuType());
         if (CollectionUtils.isEmpty(productBeanDTOS)) {
             return;
         }
@@ -149,11 +149,11 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
      * @return
      */
     private List<ProductBeanDTO> buildActivityProduct(ActivityQueryDto activityQueryDto, List<ActivityCalculationDiscountResponseDto
-            .CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList,Integer businessType) {
+            .CalculationDiscountResult.SendActivity.SendGoods> sendGoodsList,Integer menuType) {
         //获取
         List<String> goodsIds = sendGoodsList.stream().map(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods::getGoodsId).collect(Collectors.toList());
         List<ProductBeanDTO> productBeanList = assortmentSdkService.getProductsInfoSdk(activityQueryDto.getPartnerId()
-                , activityQueryDto.getStoreId(), goodsIds, businessType ,shoppingCartBaseService);
+                , activityQueryDto.getStoreId(), goodsIds, menuType ,shoppingCartBaseService);
         if (CollectionUtils.isEmpty(productBeanList)) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_GIFTS_PRODUCT_NOT_EXIST);
         }

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

@@ -6,6 +6,7 @@ import cn.freemud.entities.dto.ActivityCalculationDiscountRequestDto;
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
+import cn.freemud.enums.BusinessTypeEnum;
 import cn.freemud.enums.ProductType;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
@@ -102,7 +103,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         }
         // 获取商品信息
         List<ProductBeanDTO> productBeanListSpuClass =
-                assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2),requestVo.getBusinessType(), mealCartBaseService);
+                assortmentSdkService.getProductsInfoSdk(partnerId, storeId, Collections.singletonList(spuId2),requestVo.getMenuType(), mealCartBaseService);
         if (productBeanListSpuClass == null) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_ADD_ERROR);
         }
@@ -239,7 +240,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
             return;
         }
         //检查购物车中是否存在非法或者价格变更商品
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, customerInfo.getPartnerId(), customerInfo.getStoreId(), responseVo, orderType, customerInfo.getTableNumber(), this.mealCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, customerInfo.getPartnerId(), customerInfo.getStoreId(), responseVo, orderType, customerInfo.getTableNumber(), BusinessTypeEnum.SAAS_WC.getType(),this.mealCartBaseService);
         if (checkCartRequest != null) {
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null && StringUtils.isNotBlank(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg())) {
                 responseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
@@ -458,7 +459,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         //锁定当前所有购物车行
         this.mealCartBaseService.lockCart(partnerId, storeId, tableNumber, cartGoodsList.stream().map(CartGoods::getCartGoodsUid).collect(Collectors.toList()));
         //检查购物车中是否存在非法或者价格变更商品
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, customerInfo.getPartnerId(), customerInfo.getStoreId(), new ShoppingCartGoodsBaseResponseVo(), shoppingCartInfoRequestVo.getOrderType(), customerInfo.getTableNumber(), this.mealCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, customerInfo.getPartnerId(), customerInfo.getStoreId(), new ShoppingCartGoodsBaseResponseVo(), shoppingCartInfoRequestVo.getOrderType(), customerInfo.getTableNumber(),BusinessTypeEnum.SAAS_WC.getType() ,this.mealCartBaseService);
         if (checkCartRequest != null) {
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null && StringUtils.isNotBlank(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg())) {
                 return ResponseUtil.error(ResponseResult.SHOPPING_CART_VERSION_ERROR.getCode(), checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg(), result);
@@ -497,7 +498,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
     @Override
     public List<CartGoods> updateCartGoodsLegal(CartGoods cartGoods, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<CartGoods> oldAllCartGoodsList) {
 
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(Collections.singletonList(cartGoods), addShoppingCartGoodsRequestVo.getPartnerId(), addShoppingCartGoodsRequestVo.getShopId(), shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo.getOrderType(), addShoppingCartGoodsRequestVo.getTableNumber(), this.mealCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(Collections.singletonList(cartGoods), addShoppingCartGoodsRequestVo.getPartnerId(), addShoppingCartGoodsRequestVo.getShopId(), shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo.getOrderType(), addShoppingCartGoodsRequestVo.getTableNumber(),BusinessTypeEnum.SAAS_WC.getType() ,this.mealCartBaseService);
 
         if (checkCartRequest == null) {
             throw new ServiceException(ResponseResult.STORE_ITEM_CHECK_VAILD_ERROR);

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

@@ -325,7 +325,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         List<CartGoods> cartGoodsList = assortmentSdkService.updateGoodsQtyBySdk(partnerId, userId, storeId, cartGoodsUid, qty, "", shoppingCartBaseService);
 
         // check购物车中所有商品
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, updateShoppingCartGoodsQtyRequestVo.getOrderType(), "", shoppingCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, updateShoppingCartGoodsQtyRequestVo.getOrderType(), "", updateShoppingCartGoodsQtyRequestVo.getMenuType(), shoppingCartBaseService);
         if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
             shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
             shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
@@ -413,7 +413,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, "", shoppingCartBaseService);
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (CollectionUtils.isNotEmpty(cartGoodsList)){
-            CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), "", shoppingCartBaseService);
+            CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId,
+                shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), "", shoppingCartInfoRequestVo.getMenuType() ,shoppingCartBaseService);
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
                 shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
                 shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
@@ -547,7 +548,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
 
         // check购物车中所有商品(商品是否存在，价格变动，券是否支持当前点餐方式)
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), tableNumber, shoppingCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo,
+                shoppingCartInfoRequestVo.getOrderType(), tableNumber, shoppingCartInfoRequestVo.getMenuType() ,shoppingCartBaseService);
         com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo cartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo();
         //商品不再售卖状态或价格变动，直接返回报错
         if (cartGoodsResponseVo != null) {
@@ -575,7 +577,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             coupons.add(coupon);
         }
         if (CollectionUtils.isNotEmpty(sendGoodsList)) {
-            processSendGoods(sendGoodsList, partnerId, storeId , shoppingCartInfoRequestVo.getBusinessType() , shoppingCartBaseService);
+            processSendGoods(sendGoodsList, partnerId, storeId , shoppingCartInfoRequestVo.getMenuType() , shoppingCartBaseService);
         } else {
             //组装加价购商品
             if (null != premiumExchangeActivity && CollectionUtils.isNotEmpty(premiumExchangeActivity.getProducts())) {
@@ -829,10 +831,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      * @param storeId
      */
     private void processSendGoods(List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList
-            , String partnerId, String storeId,Integer businessType, ShoppingCartBaseService shoppingCartService) {
+            , String partnerId, String storeId,Integer menuType, ShoppingCartBaseService shoppingCartService) {
         List<String> goodsIds = sendGoodsList.parallelStream().map(ShoppingCartInfoRequestVo.SendGoods::getGoodsId).collect(Collectors.toList());
         List<ProductBeanDTO> productBeanList =
-                assortmentSdkService.getProductsInfoSdk(partnerId, storeId, goodsIds, businessType, shoppingCartService);
+                assortmentSdkService.getProductsInfoSdk(partnerId, storeId, goodsIds, menuType, shoppingCartService);
         // 将productBeanList转换为Map，key为pid，即goodsId
         Map<String, ProductBeanDTO> productBeanMap = productBeanList.parallelStream()
                 .collect(Collectors.toMap(ProductBeanDTO::getPid, Function.identity(), (k1, k2) -> k1));
@@ -1006,7 +1008,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
         //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
         CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(oldAllCartGoodsList, addShoppingCartGoodsRequestVo.getPartnerId(),
-                addShoppingCartGoodsRequestVo.getShopId(), shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo.getOrderType(), "", shoppingCartBaseService);
+                addShoppingCartGoodsRequestVo.getShopId(), shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo.getOrderType(),
+                "", addShoppingCartGoodsRequestVo.getMenuType(),shoppingCartBaseService);
         if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
             shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
             shoppingCartGoodsResponseVo.setChanged(checkCartRequest.getShoppingCartGoodsResponseVo().getChanged());
@@ -1031,6 +1034,36 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     }
 
     /**
+     * 添加非商品券商品
+     *
+     * @param addShoppingCartGoodsRequestVo
+     * @param cartGoods
+     * @param goodsId
+     * @param userId
+     * @param shoppingCartGoodsResponseVo
+     * @param allCartGoodsList
+     * @param productBeanListSpuClass
+     */
+    private Map<String, List<CartGoods>> addNotProductGoods(AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, CartGoods cartGoods
+            , String goodsId, String userId, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, List<CartGoods> allCartGoodsList
+            , List<ProductBeanDTO> productBeanListSpuClass) {
+
+        //校验合法性,更新缓存中购物车信息
+        allCartGoodsList = updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
+
+        // 如果购物车中有商品券，则当前添加的商品是特价商品时，需要提示“已选商品券，与其他优惠商品不同享，商品将恢复原价”
+        boolean haveCouponProduct = allCartGoodsList.parallelStream().anyMatch(k -> k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX));
+        if (haveCouponProduct && isSpecialGoods(addShoppingCartGoodsRequestVo.getPartnerId(), addShoppingCartGoodsRequestVo.getShopId(), userId, addShoppingCartGoodsRequestVo.getAppId(), goodsId, addShoppingCartGoodsRequestVo.getOrderType())) {
+            // 如果购物车先加入商品券，再加入促销商品，toast提示“已选商品券，与其他优惠商品不同享，商品将恢复原价”
+            setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.HAS_GOODS_COUPON_WHEN_ADD_SPECIAL_GOODS);
+        }
+
+        Map<String, List<CartGoods>> map = new HashMap<>();
+        map.put(productBeanListSpuClass.get(0).getName(), allCartGoodsList);
+        return map;
+    }
+
+    /**
      * 添加商品券商品
      *
      * @param addShoppingCartGoodsRequestVo
@@ -1072,7 +1105,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.HAS_OTHER_ACTIVITY_WHEN_ADD_GOODS_COUPON);
             }
             //校验合法性,更新缓存中购物车信息
-            updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
+            allCartGoodsList = updateCartGoodsLegal(cartGoods, userId, shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo, allCartGoodsList);
         }
     }
 
@@ -1128,17 +1161,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      */
     private void setAddAndUpdateResponse(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult
             , List<CartGoods> cartGoodsList, String toastMsg, String partnerId, String storeId, String userId, String opt, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
+        //updateCartGoodsResponse(shoppingCartGoodsResponseVo, calculationDiscountResult);
         shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
         shoppingCartGoodsResponseVo.setProductsCount(cartGoodsList.size());
         if (StringUtils.isNotEmpty(toastMsg)) {
-            toastMsg=shoppingCartInfoRequestVo!=null && ObjectUtils.equals(1, shoppingCartInfoRequestVo.getFlag())?SHOPPING_CART_EMPTY_GOODS_LIST:SHOPPING_CART_INVALIAD_GOODS;
             setToastMsgIfNotExist(shoppingCartGoodsResponseVo, toastMsg);
-            //结算页，只有商品全部非法（即products为空）时，才提示changed为true toastMsg 不为空
-            if (shoppingCartInfoRequestVo!=null && ObjectUtils.equals(1, shoppingCartInfoRequestVo.getFlag())){
-                shoppingCartGoodsResponseVo.setChanged(CollectionUtils.isEmpty(cartGoodsList));
-                shoppingCartGoodsResponseVo.setToastMsg(CollectionUtils.isEmpty(cartGoodsList)?toastMsg:"");
-            }
-
         }
         // 给前端展示
         shoppingCartGoodsResponseVo.setNewPackAmount(shoppingCartGoodsResponseVo.getPackAmount());
@@ -1165,7 +1192,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsResponseVo.setOriginalTotalAmount(originalTotalAmount);
             shoppingCartGoodsResponseVo.setTotalAmount(totalAmount);
         }
-
+        shoppingCartGoodsResponseVo.setChanged(false);
     }
 
     /**