兑换码列表搜索失效修复
This commit is contained in:
@@ -163,18 +163,10 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
|
|||||||
.orderBy(MkRedemptionConfig::getId, false);
|
.orderBy(MkRedemptionConfig::getId, false);
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case 0:
|
case 0:
|
||||||
queryWrapper.le(MkRedemptionConfig::getStartTime, DateUtil.date()).ge(MkRedemptionConfig::getEndTime, DateUtil.date());
|
queryWrapper.ge(MkRedemptionConfig::getEndTime, DateUtil.date());
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
queryWrapper.and(and -> {
|
queryWrapper.lt(MkRedemptionConfig::getEndTime, DateUtil.date());
|
||||||
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);
|
||||||
|
|||||||
Reference in New Issue
Block a user