czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兑换码列表搜索失效修复

Browse Source
This commit is contained in:
张松
2025-10-22 17:20:13 +08:00
parent d23bcde03e
commit 475e74dafe
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkRedemptionConfigServiceImpl.java
View File

@@ -139,6 +139,23 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
return infoList; return infoList;
} }
public static void main(String[] args) {
QueryWrapper queryWrapper = new QueryWrapper().eq(MkRedemptionCode::getId, 1);
queryWrapper.and(and -> {
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 @Override
public Page<MkRedemptionConfigVO> pageInfo(Long mainShopId, Integer status, boolean isRecharge) { public Page<MkRedemptionConfigVO> pageInfo(Long mainShopId, Integer status, boolean isRecharge) {
QueryWrapper queryWrapper = new QueryWrapper().eq(MkRedemptionConfig::getMainShopId, mainShopId) QueryWrapper queryWrapper = new QueryWrapper().eq(MkRedemptionConfig::getMainShopId, mainShopId)
@@ -149,7 +166,15 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
queryWrapper.le(MkRedemptionConfig::getStartTime, DateUtil.date()).ge(MkRedemptionConfig::getEndTime, DateUtil.date()); queryWrapper.le(MkRedemptionConfig::getStartTime, DateUtil.date()).ge(MkRedemptionConfig::getEndTime, DateUtil.date());
break; break;
case 1: case 1:
queryWrapper.gt(MkRedemptionConfig::getStartTime, DateUtil.date()).lt(MkRedemptionConfig::getEndTime, DateUtil.date()); queryWrapper.and(and -> {
and.or(or -> {
or.gt(MkRedemptionConfig::getStartTime, DateUtil.date());
});
and.or(or -> {
or.lt(MkRedemptionConfig::getEndTime, DateUtil.date());
});
});
break; break;
} }
Page<MkRedemptionConfig> page = page(PageUtil.buildPage(), queryWrapper); Page<MkRedemptionConfig> page = page(PageUtil.buildPage(), queryWrapper);