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

修复一个可能出现的获取促销信息的bug

Browse Source
This commit is contained in:
paulGao 2022-06-07 12:16:08 +08:00
parent ca352ca341
commit 7b9f4be98c
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java
View File

@ -164,13 +164,16 @@ public class PromotionTools {
} }
//移除无效促销活动 //移除无效促销活动
return map.entrySet().stream().filter(i -> { return map.entrySet().stream().filter(i -> {
JSONObject promotionsObj = JSONUtil.parseObj(i.getValue()); if (i != null) {
BasePromotions basePromotions = promotionsObj.toBean(BasePromotions.class); JSONObject promotionsObj = JSONUtil.parseObj(i.getValue());
if (basePromotions.getStartTime() != null && basePromotions.getEndTime() != null) { BasePromotions basePromotions = promotionsObj.toBean(BasePromotions.class);
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; return true;
}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); }).collect(Collectors.toMap(stringObjectEntry -> stringObjectEntry != null ? stringObjectEntry.getKey() : null, stringObjectEntry1 -> stringObjectEntry1 != null ? stringObjectEntry1.getValue() : new BasePromotions()));
} }
} }