Commit 3c228f3f by xiaoer.li@freemud.com

Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加车库存校验' into qa

parents b286228c bc48dd81
...@@ -1537,9 +1537,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1537,9 +1537,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if (CollectionUtils.isEmpty(allCartGoodsList)) { if (CollectionUtils.isEmpty(allCartGoodsList)) {
qty = cartGoods.getQty(); qty = cartGoods.getQty();
} else { } else {
qty = cartGoods.getQty();
for (CartGoods goods : allCartGoodsList) { for (CartGoods goods : allCartGoodsList) {
if (goods.getSkuId().equals(cartGoods.getSkuId()) && goods.getSpuId().equals(cartGoods.getSpuId())) { if (goods.getSkuId().equals(cartGoods.getSkuId()) && goods.getSpuId().equals(cartGoods.getSpuId())) {
qty = qty + cartGoods.getQty(); qty += goods.getQty();
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment