From dd2597b8621751e42afcbad550d8573bbb91903d Mon Sep 17 00:00:00 2001 From: macro Date: Sat, 27 Apr 2019 22:07:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0sku=E5=95=86=E5=93=81=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/portal/service/impl/OmsPortalOrderServiceImpl.java | 2 +- .../mall/portal/service/impl/OmsPromotionServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java index d45c953..22ac369 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java @@ -613,7 +613,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService { */ private boolean hasStock(List cartPromotionItemList) { for (CartPromotionItem cartPromotionItem : cartPromotionItemList) { - if (cartPromotionItem.getRealStock() <= 0) { + if (cartPromotionItem.getRealStock()==null||cartPromotionItem.getRealStock() <= 0) { return false; } } diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java index fe099dc..3f424fb 100644 --- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java +++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java @@ -162,7 +162,9 @@ public class OmsPromotionServiceImpl implements OmsPromotionService { cartPromotionItem.setPromotionMessage("无优惠"); cartPromotionItem.setReduceAmount(new BigDecimal(0)); PmsSkuStock skuStock = getOriginalPrice(promotionProduct,item.getProductSkuId()); - cartPromotionItem.setRealStock(skuStock.getStock()-skuStock.getLockStock()); + if(skuStock!=null){ + cartPromotionItem.setRealStock(skuStock.getStock()-skuStock.getLockStock()); + } cartPromotionItem.setIntegration(promotionProduct.getGiftPoint()); cartPromotionItem.setGrowth(promotionProduct.getGiftGrowth()); cartPromotionItemList.add(cartPromotionItem);