CC/Jarvis_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
雷欧（林平凡）
2025-07-30 15:38:27 +08:00
parent 30b9a936f2
commit b5975e101c
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/cn/van/business/util/JDUtil.java
View File

@@ -204,13 +204,13 @@ public class JDUtil {
wxUtil.sendTextMessage(chatRoom_BY, chatRoomRemark + " " + date + "\n\n " + message, 1, chatRoom_BY, true); wxUtil.sendTextMessage(chatRoom_BY, chatRoomRemark + " " + date + "\n\n " + message, 1, chatRoom_BY, true);
// 2. 生成推广内容 // 2. 生成推广内容
HashMap<String, List<String>> contentResult = generatePromotionContent(message, true); //HashMap<String, List<String>> contentResult = generatePromotionContent(message, true);
// 3. 发送文本内容 // 3. 发送文本内容
for (String text : contentResult.get("text")) { //for (String text : contentResult.get("text")) {
wxUtil.sendTextMessage(chatRoom_BY, text, 1, chatRoom_BY, true); // wxUtil.sendTextMessage(chatRoom_BY, text, 1, chatRoom_BY, true);
} //}
} }
// 具体逻辑 // 具体逻辑
@@ -2307,19 +2307,26 @@ public class JDUtil {
List<LocalDate> dateFromLD = null; List<LocalDate> dateFromLD = null;
// 处理特殊关键词：昨日、三日、七日 // 处理特殊关键词：昨日、三日、七日
if ("昨日".equals(dateStr)) { switch (dateStr) {
LocalDate yesterday = LocalDate.now().minusDays(1); case "昨日" -> {
dateFromLD = Arrays.asList(yesterday, yesterday); LocalDate yesterday = LocalDate.now().minusDays(1);
} else if ("三日".equals(dateStr)) { dateFromLD = Arrays.asList(yesterday, yesterday);
LocalDate endDate = LocalDate.now().minusDays(1); // 昨天 }
LocalDate startDate = LocalDate.now().minusDays(3); // 三天前 case "三日" -> {
dateFromLD = Arrays.asList(startDate, endDate); LocalDate endDate = LocalDate.now().minusDays(1); // 昨天
} else if ("七日".equals(dateStr)) {
LocalDate endDate = LocalDate.now().minusDays(1); // 昨天 LocalDate startDate = LocalDate.now().minusDays(3); // 三天前
LocalDate startDate = LocalDate.now().minusDays(7); // 七天前
dateFromLD = Arrays.asList(startDate, endDate); dateFromLD = Arrays.asList(startDate, endDate);
} else { }
dateFromLD = getDateFromLD(dateStr); 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()) { if (dateFromLD != null && !dateFromLD.isEmpty()) {

2
src/main/java/cn/van/business/util/WxMessageConsumer.java
View File

@@ -105,7 +105,7 @@ public class WxMessageConsumer {
if (chatRoom_xb.containsKey(fromWxid)) { if (chatRoom_xb.containsKey(fromWxid)) {
logger.info("线报群消息"); logger.info("线报群消息");
//jdUtils.xb(msg, fromWxid); jdUtils.xb(msg, fromWxid);
return; return;
} }
// 录单群 // 录单群