兑换码列表搜索失效修复
This commit is contained in:
@@ -139,6 +139,23 @@ public class MkRedemptionConfigServiceImpl extends ServiceImpl<MkCouponRedemptio
|
||||
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
|
||||
public Page<MkRedemptionConfigVO> pageInfo(Long mainShopId, Integer status, boolean isRecharge) {
|
||||
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());
|
||||
break;
|
||||
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;
|
||||
}
|
||||
Page<MkRedemptionConfig> page = page(PageUtil.buildPage(), queryWrapper);
|
||||
|
||||
Reference in New Issue
Block a user