From a6a202ce466021c764f33eaea9874d3733bb64d5 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 18:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=91=E6=8D=A2=E7=A0=81=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MkRedemptionConfigServiceImpl.java        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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