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

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

@@ -352,7 +352,12 @@ public class ShoppingCartMCoffeeServiceImpl {
 //        checkUpdateStock(partnerId, storeId, menuType, qty, cartGoods);
 
         // check购物车中所有商品
-        cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+//        cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+        List<CartGoods> temList = new ArrayList<>();
+        for (CartGoods goods : cartGoodsList) {
+            temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+        }
+        cartGoodsList = temList;
 
         // 重新存储最新购物车
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
@@ -412,7 +417,11 @@ public class ShoppingCartMCoffeeServiceImpl {
             // 合并相同商品数据
             //cartGoodsList = mergeProductList(cartGoodsList);
             // check购物车中所有商品
-            cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+            List<CartGoods> temList = new ArrayList<>();
+            for (CartGoods goods : cartGoodsList) {
+                temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+            }
+            cartGoodsList = temList;
             // 重新存储最新购物车
             assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
         }
@@ -825,12 +834,17 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         List<CartGoods> onlyCheckGoodsList = new ArrayList<>();
         if (requestVo.getOperationType() == ShoppingCartOperationType.CHECK.getCode()){
-            onlyCheckGoodsList.addAll(cartGoodsList);
             // 新门店check购物车中所有商品
-            onlyCheckGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, onlyCheckGoodsList);
+            for (CartGoods cartGoods : cartGoodsList) {
+                onlyCheckGoodsList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(cartGoods)));
+            }
         }else{
             // 新门店check购物车中所有商品
-            cartGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+            List<CartGoods> temList = new ArrayList<>();
+            for (CartGoods goods : cartGoodsList) {
+                temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+            }
+            cartGoodsList = temList;
         }
 
         if (requestVo.getOperationType() == ShoppingCartOperationType.CHECK.getCode()) {
@@ -842,7 +856,13 @@ public class ShoppingCartMCoffeeServiceImpl {
                 return ResponseUtil.success(shoppingCartGoodsResponseVo);
             }else {
                 // 新门店check购物车中所有商品
-                cartGoodsList = checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+                List<CartGoods> temList = new ArrayList<>();
+                for (CartGoods goods : cartGoodsList) {
+                    temList.addAll(checkCartGoods(partnerId, toStoreId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+                }
+                cartGoodsList = temList;
+
+
                 // 重新存储新门店购物车
                 assortmentSdkService.setShoppingCart(partnerId, toStoreId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
                 //清空商品券商品
@@ -929,7 +949,13 @@ public class ShoppingCartMCoffeeServiceImpl {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);
         }
         // check购物车中所有商品
-        cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+//        cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+        List<CartGoods> temList = new ArrayList<>();
+        for (CartGoods goods : cartGoodsList) {
+            temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+        }
+        cartGoodsList = temList;
+
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (shoppingCartGoodsResponseVo.getChanged() && requestVo.getOperationType() == ShoppingCartOperationType.CHECK.getCode()) {
             return ResponseUtil.success(shoppingCartGoodsResponseVo);
@@ -1816,7 +1842,12 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 如果购物车商品不为空， 则check购物车中所有商品
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {
             // check购物车中所有商品
-            cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+//            cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+            List<CartGoods> temList = new ArrayList<>();
+            for (CartGoods goods : cartGoodsList) {
+                temList.addAll(checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, Arrays.asList(goods)));
+            }
+            cartGoodsList = temList;
             // 重新存储最新购物车
             assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);