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

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

@@ -1170,7 +1170,8 @@ public class ShoppingCartMCoffeeServiceImpl {
         allCartGoodsList.forEach(oldCartGoods -> {
             int index;
             if ((index = nowCartGoodsList.indexOf(oldCartGoods)) >= 0) {
-                if (nowCartGoodsList.get(index).getSpuId().equals(oldCartGoods.getSpuId())){
+                if (nowCartGoodsList.get(index).getSpuId().equals(oldCartGoods.getSpuId())
+                        && nowCartGoodsList.get(index).getSkuId().equals(oldCartGoods.getSkuId())){
                     nowCartGoodsList.get(index).setQty(nowCartGoodsList.get(index).getQty() + addCartGoods.getQty());
                 }else{
                     nowCartGoodsList.add(oldCartGoods);