From 946a86d48d8dbdf2eb1faffdf69879d0485fb83e Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 12 Mar 2025 19:22:51 +0800 Subject: [PATCH] 1 --- src/main/java/cn/van/business/util/JDUtil.java | 2 +- src/main/java/cn/van/business/util/jdReq/Days0007Strategy.java | 2 +- src/main/java/cn/van/business/util/jdReq/Days0714Strategy.java | 2 +- src/main/java/cn/van/business/util/jdReq/Days1430Strategy.java | 2 +- src/main/java/cn/van/business/util/jdReq/Days3090Strategy.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 4b74673..2722dea 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -1177,7 +1177,7 @@ public class JDUtil { // 新增礼金流程处理方法 private void handleGiftMoneyFlow(String fromWxid, String message, UserInteractionState state) { - if ("京礼金".equals(message)) { + if ("礼金".equals(message)) { state.reset(); // 重置流程 wxUtil.sendTextMessage(fromWxid, "流程已重置，请重新开始", 1, fromWxid); return; diff --git a/src/main/java/cn/van/business/util/jdReq/Days0007Strategy.java b/src/main/java/cn/van/business/util/jdReq/Days0007Strategy.java index 1595f9d..88b1220 100644 --- a/src/main/java/cn/van/business/util/jdReq/Days0007Strategy.java +++ b/src/main/java/cn/van/business/util/jdReq/Days0007Strategy.java @@ -13,7 +13,7 @@ public class Days0007Strategy implements OrderFetchStrategy { LocalDateTime end = baseTime.truncatedTo(ChronoUnit.HOURS); LocalDateTime start = end.minusDays(7).truncatedTo(ChronoUnit.HOURS); if (start.isAfter(end)) { // 防御性校验 - throw new IllegalArgumentException("时间范围错误"); + throw new IllegalArgumentException(strategyName()+"时间范围错误"); } return new TimeRange(start, end); } diff --git a/src/main/java/cn/van/business/util/jdReq/Days0714Strategy.java b/src/main/java/cn/van/business/util/jdReq/Days0714Strategy.java index d431051..c0e3dcb 100644 --- a/src/main/java/cn/van/business/util/jdReq/Days0714Strategy.java +++ b/src/main/java/cn/van/business/util/jdReq/Days0714Strategy.java @@ -12,7 +12,7 @@ public class Days0714Strategy implements OrderFetchStrategy { LocalDateTime end = baseTime.truncatedTo(ChronoUnit.HOURS).minusDays(7); LocalDateTime start = end.minusDays(14).truncatedTo(ChronoUnit.HOURS); if (start.isAfter(end)) { // 防御性校验 - throw new IllegalArgumentException("时间范围错误"); + throw new IllegalArgumentException(strategyName()+"时间范围错误"); } return new TimeRange(start, end); } diff --git a/src/main/java/cn/van/business/util/jdReq/Days1430Strategy.java b/src/main/java/cn/van/business/util/jdReq/Days1430Strategy.java index c93ee9c..65218dc 100644 --- a/src/main/java/cn/van/business/util/jdReq/Days1430Strategy.java +++ b/src/main/java/cn/van/business/util/jdReq/Days1430Strategy.java @@ -10,7 +10,7 @@ public class Days1430Strategy implements OrderFetchStrategy { LocalDateTime end = baseTime.minusDays(30).truncatedTo(ChronoUnit.HOURS); LocalDateTime start = baseTime.minusDays(14).truncatedTo(ChronoUnit.HOURS); if (start.isAfter(end)) { // 防御性校验 - throw new IllegalArgumentException("时间范围错误"); + throw new IllegalArgumentException(strategyName()+"时间范围错误"); } return new TimeRange(start, end); } diff --git a/src/main/java/cn/van/business/util/jdReq/Days3090Strategy.java b/src/main/java/cn/van/business/util/jdReq/Days3090Strategy.java index 52b4a43..8bad8f7 100644 --- a/src/main/java/cn/van/business/util/jdReq/Days3090Strategy.java +++ b/src/main/java/cn/van/business/util/jdReq/Days3090Strategy.java @@ -11,7 +11,7 @@ public class Days3090Strategy implements OrderFetchStrategy { LocalDateTime end = baseTime.minusMonths(1); LocalDateTime start = end.minusMonths(2); if (start.isAfter(end)) { // 防御性校验 - throw new IllegalArgumentException("时间范围错误"); + throw new IllegalArgumentException(strategyName()+"时间范围错误"); } return new TimeRange(start, end); }