From b5975e101c0e4bee0b98767e3e9be35da91563e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?=
 =?UTF-8?q?=EF=BC=89?= <leo@qi-cloud.com>
Date: Wed, 30 Jul 2025 15:38:27 +0800
Subject: [PATCH] 1

---
 .../java/cn/van/business/util/JDUtil.java     | 41 +++++++++++--------
 .../van/business/util/WxMessageConsumer.java  |  2 +-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java
index 312935f..ad0bff4 100644
--- a/src/main/java/cn/van/business/util/JDUtil.java
+++ b/src/main/java/cn/van/business/util/JDUtil.java
@@ -204,13 +204,13 @@ public class JDUtil {
             wxUtil.sendTextMessage(chatRoom_BY, chatRoomRemark + "  " + date + "\n\n " + message, 1, chatRoom_BY, true);
 
             // 2. 生成推广内容
-            HashMap<String, List<String>> contentResult = generatePromotionContent(message, true);
+            //HashMap<String, List<String>> contentResult = generatePromotionContent(message, true);
 
 
             // 3. 发送文本内容
-            for (String text : contentResult.get("text")) {
-                wxUtil.sendTextMessage(chatRoom_BY, text, 1, chatRoom_BY, true);
-            }
+            //for (String text : contentResult.get("text")) {
+            //    wxUtil.sendTextMessage(chatRoom_BY, text, 1, chatRoom_BY, true);
+            //}
 
         }
         // 具体逻辑
@@ -2307,19 +2307,26 @@ public class JDUtil {
                 List<LocalDate> 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);
+                switch (dateStr) {
+                    case "昨日" -> {
+                        LocalDate yesterday = LocalDate.now().minusDays(1);
+                        dateFromLD = Arrays.asList(yesterday, yesterday);
+                    }
+                    case "三日" -> {
+                        LocalDate endDate = LocalDate.now().minusDays(1); // 昨天
+
+                        LocalDate startDate = LocalDate.now().minusDays(3); // 三天前
+
+                        dateFromLD = Arrays.asList(startDate, endDate);
+                    }
+                    case "七日" -> {
+                        LocalDate endDate = LocalDate.now().minusDays(1); // 昨天
+
+                        LocalDate startDate = LocalDate.now().minusDays(7); // 七天前
+
+                        dateFromLD = Arrays.asList(startDate, endDate);
+                    }
+                    default -> dateFromLD = getDateFromLD(dateStr);
                 }
 
                 if (dateFromLD != null && !dateFromLD.isEmpty()) {
diff --git a/src/main/java/cn/van/business/util/WxMessageConsumer.java b/src/main/java/cn/van/business/util/WxMessageConsumer.java
index fe5b885..3feddb4 100644
--- a/src/main/java/cn/van/business/util/WxMessageConsumer.java
+++ b/src/main/java/cn/van/business/util/WxMessageConsumer.java
@@ -105,7 +105,7 @@ public class WxMessageConsumer {
 
         if (chatRoom_xb.containsKey(fromWxid)) {
             logger.info("线报群消息");
-            //jdUtils.xb(msg, fromWxid);
+            jdUtils.xb(msg, fromWxid);
             return;
         }
         // 录单群