diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java index c484cd78a..100594c7f 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java @@ -163,17 +163,25 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl { + and.or(or -> { + or.lt(MkRedemptionConfig::getEndTime, DateUtil.date()); + }); + + and.or(or -> { + or.gt(MkRedemptionConfig::getStartTime, DateUtil.date()); + }); + }); break; } Page page = page(PageUtil.buildPage(), queryWrapper); ArrayList configList = new ArrayList<>(); page.getRecords().forEach(item -> { if (item.getStartTime() != null && item.getEndTime() != null) { - item.setStatus(item.getEndTime().isAfter(DateUtil.date().toLocalDateTime()) ? 0 : 1); + item.setStatus(item.getStartTime().isBefore(DateUtil.date().toLocalDateTime()) && item.getEndTime().isAfter(DateUtil.date().toLocalDateTime()) ? 0 : 1); }else { item.setStatus(0); }