From 475e74dafe4fce9e534ceb8a771e4e7811cb35dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Wed, 22 Oct 2025 17:20:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=A0=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=A4=B1=E6=95=88=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MkRedemptionConfigServiceImpl.java   | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

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<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);