Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa

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

@@ -208,7 +208,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         // 购物车数据更新(保存商品原价)
-        log.info("oldCartGoodsList: {}, addCartGoodsList:{}",JSONObject.toJSONString(oldCartGoodsList),JSONObject.toJSONString(addCartGoods));
         List<CartGoods> newCartGoods = updateCartGoodsLegal(partnerId, storeId, orderType, tableNumber, menuType, userId, addCartGoods, shoppingCartGoodsResponseVo, oldCartGoodsList);
 
         // 促销活动等价格计算
@@ -1164,13 +1163,17 @@ public class ShoppingCartMCoffeeServiceImpl {
         newCartGoods.add(addCartGoods);
 
         //加购商品校验
-        List<CartGoods> allCartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, newCartGoods);
+        List<CartGoods> allCartGoodsList = 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) {
+            List<CartGoods> sameGoods =
+                    nowCartGoodsList.stream().filter(nowCartGood-> nowCartGood.getSkuId().equals(oldCartGoods.getSkuId())
+                    && nowCartGood.getSpuId().equals(oldCartGoods.getSpuId())).collect(Collectors.toList());
+
+            if ((index = nowCartGoodsList.indexOf(oldCartGoods)) >= 0 && sameGoods.size()>0) {
                 nowCartGoodsList.get(index).setQty(nowCartGoodsList.get(index).getQty() + addCartGoods.getQty());
             } else {
                 nowCartGoodsList.add(oldCartGoods);