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 1ea9af00f..d6cd4548e 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 @@ -139,6 +139,23 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl { + and.or(or -> { + or.gt(MkRedemptionConfig::getStartTime, DateUtil.date()); + or.lt(MkRedemptionConfig::getEndTime, DateUtil.date()); + + }); + + and.or(or -> { + or.lt(MkRedemptionConfig::getEndTime, DateUtil.date()); + }); + }); + + System.out.println(queryWrapper.toSQL()); + } + @Override public Page pageInfo(Long mainShopId, Integer status, boolean isRecharge) { QueryWrapper queryWrapper = new QueryWrapper().eq(MkRedemptionConfig::getMainShopId, mainShopId) @@ -149,7 +166,15 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl { + and.or(or -> { + or.gt(MkRedemptionConfig::getStartTime, DateUtil.date()); + }); + + and.or(or -> { + or.lt(MkRedemptionConfig::getEndTime, DateUtil.date()); + }); + }); break; } Page page = page(PageUtil.buildPage(), queryWrapper);