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

!184 过滤无效促销信息异常增加日志

Browse Source 
Merge pull request !184 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2022-06-07 07:07:54 +00:00 committed by Gitee
commit fd503b4071
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ import cn.lili.modules.promotion.entity.dos.BasePromotions;
import cn.lili.modules.promotion.entity.dos.PromotionGoods; import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.enums.PromotionsStatusEnum; import cn.lili.modules.promotion.entity.enums.PromotionsStatusEnum;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import java.util.*; import java.util.*;
import java.util.function.Consumer; import java.util.function.Consumer;
@ -25,6 +26,7 @@ import java.util.stream.Collectors;
* @author paulG * @author paulG
* @since 2020/8/18 * @since 2020/8/18
**/ **/
@Slf4j
public class PromotionTools { public class PromotionTools {
public static final String START_TIME_COLUMN = "start_time"; public static final String START_TIME_COLUMN = "start_time";
@ -163,18 +165,23 @@ public class PromotionTools {
if (CollUtil.isEmpty(map)) { if (CollUtil.isEmpty(map)) {
return new HashMap<>(); return new HashMap<>();
} }
//移除无效促销活动 try {
return map.entrySet().stream().filter(i -> { //移除无效促销活动
if (i != null) { 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(stringObjectEntry -> stringObjectEntry != null ? stringObjectEntry.getKey() : null, stringObjectEntry1 -> stringObjectEntry1 != null ? stringObjectEntry1.getValue() : new BasePromotions(), (oldValue, newValue) -> newValue)); }).collect(Collectors.toMap(stringObjectEntry -> stringObjectEntry != null ? stringObjectEntry.getKey() : null, stringObjectEntry1 -> stringObjectEntry1 != null ? stringObjectEntry1.getValue() : new BasePromotions(), (oldValue, newValue) -> newValue));
} catch (Exception e) {
log.error("过滤无效促销活动出现异常。异常促销信息：{}，异常信息：{} ", map, e);
return new HashMap<>();
}
} }
} }