Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa

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

@@ -1171,24 +1171,26 @@ public class ShoppingCartMCoffeeServiceImpl {
      */
     public List<CartGoods> updateCartGoodsLegal(String partnerId, String storeId, Integer orderType, String tableNumber, String menuType, String userId,
                                                 CartGoods addCartGoods, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> oldCartGoodsList) {
+        oldCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, oldCartGoodsList);
         List<CartGoods> newCartGoods = new ArrayList<>();
-        newCartGoods.addAll(oldCartGoodsList);
         newCartGoods.add(addCartGoods);
-
         //加购商品校验
-        List<CartGoods> allCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, newCartGoods);
-
+        List<CartGoods> newCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType,shoppingCartGoodsResponseVo, newCartGoods);
         List<CartGoods> nowCartGoodsList = new ArrayList<>();
-        //判断当前商品在购物车是否已存在,存在则数量＋1,不存在商品行 + 1
-        allCartGoodsList.forEach(oldCartGoods -> {
-            int index;
-            if ((index = nowCartGoodsList.indexOf(oldCartGoods)) >= 0) {
-                nowCartGoodsList.get(index).setQty(nowCartGoodsList.get(index).getQty() + addCartGoods.getQty());
-            } else {
-                nowCartGoodsList.add(oldCartGoods);
-            }
-        });
-
+        if(CollectionUtils.isNotEmpty(oldCartGoodsList)){
+            nowCartGoodsList.addAll(oldCartGoodsList);
+        }
+        if(CollectionUtils.isNotEmpty(newCartGoodsList)){
+            //判断当前商品在购物车是否已存在,存在则数量＋1,不存在商品行 + 1
+            newCartGoodsList.forEach(newCartGood -> {
+                int index;
+                if ((index = nowCartGoodsList.indexOf(newCartGood)) >= 0) {
+                    nowCartGoodsList.get(index).setQty(nowCartGoodsList.get(index).getQty() + addCartGoods.getQty());
+                } else {
+                    nowCartGoodsList.add(newCartGood);
+                }
+            });
+        }
         // 重新set购物车信息到缓存中
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, nowCartGoodsList, null, tableNumber, this.shoppingCartBaseService);
         return nowCartGoodsList;