From 7e6dd11969968655e77ced67b97ffcbc33de9ae9 Mon Sep 17 00:00:00 2001
From: Van0313 <60689272+Van0313@users.noreply.github.com>
Date: Thu, 19 Jun 2025 00:55:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/van/business/util/JDUtil.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java
index 787d02f..407c352 100644
--- a/src/main/java/cn/van/business/util/JDUtil.java
+++ b/src/main/java/cn/van/business/util/JDUtil.java
@@ -2124,17 +2124,19 @@ public class JDUtil {
 
     public void manman(String input, String fromWxid) {
         // 1️⃣ 调用封装好的方法提取日期
-        LocalDate userDate = parseUserDateIfPresent(input);
+        List<LocalDate> userDate = parseUserDateIfPresent(input);
 
         // 2️⃣ 获取有效“今天”
         LocalDateTime today = getEffectiveToday();
-        if (userDate != null) {
-            today = userDate.atStartOfDay(); // ⬅️ 用户指定了日期
+        if (userDate == null) {
+            userDate.add(today.toLocalDate());
+        }
+        if (userDate.size() == 1) {
+            userDate.add(today.toLocalDate());
         }
-
         // 3️⃣ 构造查询时间范围
-        LocalDateTime startOfDay = today.with(LocalTime.MIN);
-        LocalDateTime endOfDay = today.with(LocalTime.MAX);
+        LocalDateTime startOfDay = LocalDateTime.from(userDate.get(0).with(LocalTime.MIN));
+        LocalDateTime endOfDay = LocalDateTime.from(userDate.get(1).with(LocalTime.MAX));
 
         Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
         Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());