Merge branch 'feature/new-fixbig' into qa

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

@@ -960,6 +960,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
                 if (CollectionUtils.isEmpty(cartGoods.getProductGroupList()) && CollectionUtils.isEmpty(cartGoods.getProductComboList())) {
                     cartGoodsList.remove(i);
+                    assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, null, null, this.shoppingCartBaseService);
                     throw new ServiceException(ResponseResult.SHOPPING_CART_NO_MEAL);
                 }
             }

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

@@ -121,6 +121,7 @@ public class CalculationSharingDiscountService {
             if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
                 if (CollectionUtils.isEmpty(cartGoods.getProductGroupList()) && CollectionUtils.isEmpty(cartGoods.getProductComboList())) {
                     cartGoodsList.remove(i);
+                    assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, null, null, this.shoppingCartBaseService);
                     throw new ServiceException(ResponseResult.SHOPPING_CART_NO_MEAL);
                 }
             }