github/mall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

无sku商品下单问题修复

Browse Source
This commit is contained in:
macro 2019-04-27 22:07:51 +08:00
parent 34c12ecf7c
commit dd2597b862
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
View File

@ -613,7 +613,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
*/ */
private boolean hasStock(List<CartPromotionItem> cartPromotionItemList) { private boolean hasStock(List<CartPromotionItem> cartPromotionItemList) {
for (CartPromotionItem cartPromotionItem : cartPromotionItemList) { for (CartPromotionItem cartPromotionItem : cartPromotionItemList) {
if (cartPromotionItem.getRealStock() <= 0) { if (cartPromotionItem.getRealStock()==null||cartPromotionItem.getRealStock() <= 0) {
return false; return false;
} }
} }

4
mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPromotionServiceImpl.java
View File

@ -162,7 +162,9 @@ public class OmsPromotionServiceImpl implements OmsPromotionService {
cartPromotionItem.setPromotionMessage("无优惠"); cartPromotionItem.setPromotionMessage("无优惠");
cartPromotionItem.setReduceAmount(new BigDecimal(0)); cartPromotionItem.setReduceAmount(new BigDecimal(0));
PmsSkuStock skuStock = getOriginalPrice(promotionProduct,item.getProductSkuId()); 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.setIntegration(promotionProduct.getGiftPoint());
cartPromotionItem.setGrowth(promotionProduct.getGiftGrowth()); cartPromotionItem.setGrowth(promotionProduct.getGiftGrowth());
cartPromotionItemList.add(cartPromotionItem); cartPromotionItemList.add(cartPromotionItem);