add:通spu+sku识别商品数量

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

@@ -247,8 +247,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (CollectionUtils.isEmpty(allCartGoodsList)) {
             allCartGoodsList = new ArrayList<>();
         }
-        Integer checkQty = allCartGoodsList.indexOf(cartGoods) != -1 ?
-                allCartGoodsList.get(allCartGoodsList.indexOf(cartGoods)).getQty() + cartGoods.getQty() : cartGoods.getQty();
+        /**
+         Integer checkQty = allCartGoodsList.indexOf(cartGoods) != -1 ?
+         allCartGoodsList.get(allCartGoodsList.indexOf(cartGoods)).getQty() + cartGoods.getQty() : cartGoods.getQty();
+         */
+        Integer checkQty = this.checkSkuQty(allCartGoodsList, cartGoods);
 
         //查询多个商品库存信息
         queryManyGoodsStocks(addShoppingCartGoodsRequestVo, productIds, productBeanListSpuClass, skuId, checkQty);
@@ -257,7 +260,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 当添加的商品不是商品券时
         if (!spuId.startsWith(CommonsConstant.COUPON_PREFIX)) {
             //添加非商品券商品
-             addNotProductGoods(addShoppingCartGoodsRequestVo, cartGoods, goodsId, userId, shoppingCartGoodsResponseVo, allCartGoodsList);
+            addNotProductGoods(addShoppingCartGoodsRequestVo, cartGoods, goodsId, userId, shoppingCartGoodsResponseVo, allCartGoodsList);
         } else {
             // 当商品是商品券，里面会判断如果购物车中已有商品券，会将cartGoods的CartGoodsUid设为null
             this.addProductGoods(addShoppingCartGoodsRequestVo, cartGoods, spuId2, userId, shoppingCartGoodsResponseVo,
@@ -1510,4 +1513,24 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         return sessionUserInfo.getResult();
     }
 
+    /**
+     * 检查sku数量
+     *
+     * @param allCartGoodsList
+     * @param cartGoods
+     * @return
+     */
+    private Integer checkSkuQty(List<CartGoods> allCartGoodsList, CartGoods cartGoods) {
+        Integer qty = 0;
+        if (allCartGoodsList == null) {
+            qty = cartGoods.getQty();
+        } else {
+            for (CartGoods goods : allCartGoodsList) {
+                if (goods.getSkuId().equals(cartGoods.getSkuId()) && goods.getSpuId().equals(cartGoods.getSpuId())) {
+                    qty = qty + cartGoods.getQty();
+                }
+            }
+        }
+        return qty;
+    }
 }