This commit is contained in:
Van0313
2025-06-19 00:55:36 +08:00
parent 417edf1f72
commit 7e6dd11969

View File

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