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 18:17:50 +08:00
parent dc79450b44
commit a6a202ce46
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,17 +163,25 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
.orderBy(MkRedemptionConfig::getId, false); .orderBy(MkRedemptionConfig::getId, false);
switch (status) { switch (status) {
case 0: case 0:
queryWrapper.ge(MkRedemptionConfig::getEndTime, DateUtil.date()); queryWrapper.ge(MkRedemptionConfig::getEndTime, DateUtil.date()).le(MkRedemptionConfig::getStartTime, DateUtil.date());
break; break;
case 1: case 1:
queryWrapper.lt(MkRedemptionConfig::getEndTime, DateUtil.date()); queryWrapper.and(and -> {
and.or(or -> {
or.lt(MkRedemptionConfig::getEndTime, DateUtil.date());
});
and.or(or -> {
or.gt(MkRedemptionConfig::getStartTime, DateUtil.date());
});
});
break; break;
} }
Page<MkRedemptionConfig> page = page(PageUtil.buildPage(), queryWrapper); Page<MkRedemptionConfig> page = page(PageUtil.buildPage(), queryWrapper);
ArrayList<MkRedemptionConfigVO> configList = new ArrayList<>(); ArrayList<MkRedemptionConfigVO> configList = new ArrayList<>();
page.getRecords().forEach(item -> { page.getRecords().forEach(item -> {
if (item.getStartTime() != null && item.getEndTime() != null) { 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 { }else {
item.setStatus(0); item.setStatus(0);
} }