Commit f03c3ee7 by xiaoer.li@freemud.com

fix

parent b303a1a8
...@@ -95,6 +95,7 @@ public enum ResponseResult { ...@@ -95,6 +95,7 @@ public enum ResponseResult {
SHOPPING_CART_HG_COUPON_NOT_EXIST("44027", "换购券不存在"), SHOPPING_CART_HG_COUPON_NOT_EXIST("44027", "换购券不存在"),
SHOPPING_CART_LIMIT_ADD("44025", "加购数量超过限制"), SHOPPING_CART_LIMIT_ADD("44025", "加购数量超过限制"),
SHOPPING_CART_GOODS_CHECK_ERROR("44028", "当前餐盘中没有可用券的饮品"), SHOPPING_CART_GOODS_CHECK_ERROR("44028", "当前餐盘中没有可用券的饮品"),
SHOPPING_CART_NO_MEAL("44029", "无固定搭配套餐请至少选择一个可选商品"),
/** /**
* 订单状态码 * 订单状态码
......
...@@ -949,6 +949,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -949,6 +949,13 @@ 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);
throw new ServiceException(ResponseResult.SHOPPING_CART_NO_MEAL);
}
}
} }
// 当加价购商品不为空时 // 当加价购商品不为空时
if (CollectionUtils.isNotEmpty(sendGoodsList)) { if (CollectionUtils.isNotEmpty(sendGoodsList)) {
......
...@@ -120,6 +120,14 @@ public class CalculationSharingDiscountService { ...@@ -120,6 +120,14 @@ public class CalculationSharingDiscountService {
} }
} }
} }
if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
if (CollectionUtils.isEmpty(cartGoods.getProductGroupList()) && CollectionUtils.isEmpty(cartGoods.getProductComboList())) {
cartGoodsList.remove(i);
throw new ServiceException(ResponseResult.SHOPPING_CART_NO_MEAL);
}
}
} }
/*加价购商品不为空*/ /*加价购商品不为空*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment