Commit 9ba3bbaa by 徐康

9998过滤

parent f8ad4d8d
...@@ -703,7 +703,6 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -703,7 +703,6 @@ public class ShoppingCartMCoffeeServiceImpl {
boolean isB3S1Coupon = false; boolean isB3S1Coupon = false;
String b3S1CouponCode = ""; String b3S1CouponCode = "";
List<CartGoods> temList = new ArrayList<>(); List<CartGoods> temList = new ArrayList<>();
CartGoods b3S1CartGoods = new CartGoods();
for (CartGoods cartGoods_ : cartGoodsList) { for (CartGoods cartGoods_ : cartGoodsList) {
//如果菜单购月卡数量大于10,则不作数量修改,直接算价并返回之前购物车信息 //如果菜单购月卡数量大于10,则不作数量修改,直接算价并返回之前购物车信息
if (Objects.equals(1,cartGoods_.getIsMonthCard()) if (Objects.equals(1,cartGoods_.getIsMonthCard())
...@@ -737,12 +736,8 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -737,12 +736,8 @@ public class ShoppingCartMCoffeeServiceImpl {
finalQty = cartGoods_.getQty(); finalQty = cartGoods_.getQty();
break; break;
} }
if("9998".equals(cartGoods_.getSkuId())) {
b3S1CartGoods = cartGoods_;
} else {
temList.add(cartGoods_); temList.add(cartGoods_);
} }
}
if(isB3S1Coupon) { if(isB3S1Coupon) {
cartGoodsList = clearB3S1CouponInfo(cartGoodsList,b3S1CouponCode); cartGoodsList = clearB3S1CouponInfo(cartGoodsList,b3S1CouponCode);
} }
...@@ -766,7 +761,6 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -766,7 +761,6 @@ public class ShoppingCartMCoffeeServiceImpl {
// check购物车中所有商品 // check购物车中所有商品
cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, temList, sessionId); cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, temList, sessionId);
cartGoodsList.add(b3S1CartGoods);
// List<CartGoods> temList = new ArrayList<>(); // List<CartGoods> temList = new ArrayList<>();
// for (CartGoods goods : cartGoodsList) { // for (CartGoods goods : cartGoodsList) {
// temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods), sessionId)); // temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods), sessionId));
......
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