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

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

@@ -1169,12 +1169,12 @@ public class ShoppingCartMCoffeeServiceImpl {
         //判断当前商品在购物车是否已存在,存在则数量＋1,不存在商品行 + 1
         allCartGoodsList.forEach(oldCartGoods -> {
             int index;
-            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) {
+            if ((index = nowCartGoodsList.indexOf(oldCartGoods)) >= 0) {
+                if (nowCartGoodsList.get(index).getSpuId().equals(oldCartGoods.getSpuId())){
                     nowCartGoodsList.get(index).setQty(nowCartGoodsList.get(index).getQty() + addCartGoods.getQty());
+                }else{
+                    nowCartGoodsList.add(oldCartGoods);
+                }
             } else {
                 nowCartGoodsList.add(oldCartGoods);
             }