From 9dc40f3aa7df3bdd489bd750d59fec8bac741a23 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Thu, 08 Jan 2026 17:48:09 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
index fa4b41c..1d1e4c5 100644
--- a/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockSubscribeServiceImpl.java
@@ -64,7 +64,9 @@
         }
         String s = DateTimeUtil.dateToStr(new Date());
         //subscribe_time大于当前时间
-        queryWrapper.ge("subscribe_time", DateTimeUtil.dateToStr1(new Date())).orderByAsc("subscribe_time");
+//        queryWrapper.ge("subscribe_time", DateTimeUtil.dateToStr1(new Date())).orderByAsc("subscribe_time");
+        queryWrapper.le("subscribe_time", DateTimeUtil.dateToStr1(new Date()))
+                .ge("subscription_time", DateTimeUtil.dateToStr1(new Date())).orderByAsc("subscribe_time");
         List<StockSubscribe> stockSubscribeList = this.stockSubscribeMapper.selectList(queryWrapper);
 
 //        List<StockAdminListVO> stockAdminListVOS = Lists.newArrayList();
@@ -96,7 +98,7 @@
         }
         String s = DateTimeUtil.dateToStr(new Date());
         //subscribe_time大于当前时间
-        queryWrapper.orderByAsc("subscribe_time");
+        queryWrapper.orderByDesc("subscribe_time");
         List<StockSubscribe> stockSubscribeList = this.stockSubscribeMapper.selectList(queryWrapper);
 
 //        List<StockAdminListVO> stockAdminListVOS = Lists.newArrayList();

--
Gitblit v1.9.3