校验商品

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

@@ -1611,17 +1611,8 @@ public class ShoppingCartMCoffeeServiceImpl {
      */
     public List<CartGoods> updateCartGoodsLegal(String partnerId, String storeId, Integer orderType, String tableNumber, String menuType, String sessionId,
                                                 CartGoods addCartGoods, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> oldCartGoodsList) {
-        List<CartGoods> temList = new ArrayList<>();
-        CartGoods b3S1CartGoods = new CartGoods();
-        for (CartGoods cartGoods : oldCartGoodsList) {
-            if("9998".equals(cartGoods.getSkuId())) {
-                b3S1CartGoods = cartGoods;
-            } else {
-                temList.add(cartGoods);
-            }
-        }
+
         oldCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, oldCartGoodsList, sessionId);
-        oldCartGoodsList.add(b3S1CartGoods);
         List<CartGoods> newCartGoods = new ArrayList<>();
         newCartGoods.add(addCartGoods);
 
@@ -2030,10 +2021,20 @@ public class ShoppingCartMCoffeeServiceImpl {
         //超值加购活动商品
         List<CartGoods> reduceGoods = cartGoodsList.stream().filter(cartGoods -> cartGoods.getGoodsType() == GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType()).collect(Collectors.toList());
 
+        List<CartGoods> temList = new ArrayList<>();
+        CartGoods b3S1CartGoods = new CartGoods();
+        for (CartGoods cartGoods : checkGoods) {
+            if("9998".equals(cartGoods.getSkuId())) {
+                b3S1CartGoods = cartGoods;
+            } else {
+                temList.add(cartGoods);
+            }
+        }
+
         List<CartGoods> allCartGoodsList = new ArrayList<>();
-        if (CollectionUtils.isNotEmpty(checkGoods)) {
+        if (CollectionUtils.isNotEmpty(temList)) {
             //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
-            CheckCartRequest checkCartRequest = checkShoppingCartSdkForMCoffee(checkGoods, partnerId,
+            CheckCartRequest checkCartRequest = checkShoppingCartSdkForMCoffee(temList, partnerId,
                     storeId, shoppingCartGoodsResponseVo, orderType, sessionId, menuType, shoppingCartBaseService);
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
                 shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
@@ -2041,6 +2042,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             }
             allCartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
         }
+        allCartGoodsList.add(b3S1CartGoods);
 
         //添加商品为超值加购活动商品
         if (CollectionUtils.isNotEmpty(reduceGoods)) {