caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!85 修复结算时无促销报错问题

Browse Source 
Merge pull request !85 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2021-12-22 07:40:24 +00:00 committed by Gitee
commit 3fb4e488bb
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java
View File

@ -114,13 +114,15 @@ public class CheckDataRender implements CartRenderStep {
cartSkuVO.setErrorMessage("商品库存不足,现有库存数量[" + dataSku.getQuantity() + "]"); cartSkuVO.setErrorMessage("商品库存不足,现有库存数量[" + dataSku.getQuantity() + "]");
} }
//移除无效促销活动 //移除无效促销活动
cartSkuVO.setPromotionMap(cartSkuVO.getPromotionMap().entrySet().stream().filter(i -> { if (cartSkuVO.getPromotionMap() != null && !cartSkuVO.getPromotionMap().isEmpty()) {
BasePromotions basePromotions = (BasePromotions) i.getValue(); cartSkuVO.setPromotionMap(cartSkuVO.getPromotionMap().entrySet().stream().filter(i -> {
if (basePromotions.getStartTime() != null && basePromotions.getEndTime() != null) { BasePromotions basePromotions = (BasePromotions) i.getValue();
return basePromotions.getStartTime().getTime() <= System.currentTimeMillis() && basePromotions.getEndTime().getTime() >= System.currentTimeMillis(); if (basePromotions.getStartTime() != null && basePromotions.getEndTime() != null) {
} return basePromotions.getStartTime().getTime() <= System.currentTimeMillis() && basePromotions.getEndTime().getTime() >= System.currentTimeMillis();
return true; }
}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))); return true;
}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
}
} }
} }