diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 55962aa..3d299f3 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -2300,7 +2300,24 @@ public class JDUtil { String dateStr = input.replaceAll("慢单|录单", "").trim(); logger.info("解析出的日期 {}", dateStr); if (!dateStr.isEmpty()) { - List dateFromLD = getDateFromLD(dateStr); + List dateFromLD = null; + + // 处理特殊关键词:昨日、三日、七日 + if ("昨日".equals(dateStr)) { + LocalDate yesterday = LocalDate.now().minusDays(1); + dateFromLD = Arrays.asList(yesterday, yesterday); + } else if ("三日".equals(dateStr)) { + LocalDate endDate = LocalDate.now().minusDays(1); // 昨天 + LocalDate startDate = LocalDate.now().minusDays(3); // 三天前 + dateFromLD = Arrays.asList(startDate, endDate); + } else if ("七日".equals(dateStr)) { + LocalDate endDate = LocalDate.now().minusDays(1); // 昨天 + LocalDate startDate = LocalDate.now().minusDays(7); // 七天前 + dateFromLD = Arrays.asList(startDate, endDate); + } else { + dateFromLD = getDateFromLD(dateStr); + } + if (dateFromLD != null && !dateFromLD.isEmpty()) { // 如果只有一个日期,复制一份形成范围 if (dateFromLD.size() == 1) {