From 4fd197451f142f0d60ba4fd6c4c1fbcb10bb4a5b 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, 18 Jun 2025 17:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/van/business/util/JDUtil.java | 12 ++++++------
 .../van/business/util/WxMessageConsumer.java   | 18 +++++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java
index 7343a31..bb9a912 100644
--- a/src/main/java/cn/van/business/util/JDUtil.java
+++ b/src/main/java/cn/van/business/util/JDUtil.java
@@ -1722,17 +1722,17 @@ public class JDUtil {
         }
 
         if (order.trim().isEmpty()) {
-            wxUtil.sendTextMessage(fromWxid, "输入格式为：\n 单\n分销标记\n型号\n转链链接\n数量\n地址", 1, fromWxid, false);
+            wxUtil.sendTextMessage(fromWxid, "输入格式为：\n 生\n分销标记\n型号\n转链链接\n数量\n地址", 1, fromWxid, false);
             return;
         }
         String[] split = order.split("\n");
         if (split.length != 6) {
-            wxUtil.sendTextMessage(fromWxid, "输入格式为：\n 单\n分销标记\n型号\n转链链接\n数量\n地址", 1, fromWxid, false);
+            wxUtil.sendTextMessage(fromWxid, "输入格式为：\n 生\n分销标记\n型号\n转链链接\n数量\n地址", 1, fromWxid, false);
             return;
         }
         String remark = "";
-        if (!split[0].trim().replace("单", "").isEmpty()) {
-            remark = split[0].trim().replace("{单}", "").replace("\n", "");
+        if (!split[0].trim().replace("生", "").isEmpty()) {
+            remark = split[0].trim().replace("{生}", "").replace("\n", "");
         }
         // 今天的日期
         String today = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd "));
@@ -2299,7 +2299,7 @@ public class JDUtil {
                 }
 
                 StringBuilder order = new StringBuilder();
-                order.append("单").append("\n").append("H-TF").append("\n").append(modelNumber).append("\n").append(" ").append("\n").append(quantityStr).append("\n").append(address);
+                order.append("生").append("\n").append("H-TF").append("\n").append(modelNumber).append("\n").append(" ").append("\n").append(quantityStr).append("\n").append(address);
                 sendOrderToWxByOrderD(order.toString(), fromWxid);
             }
         } else if (input.startsWith("H")) {
@@ -2391,7 +2391,7 @@ public class JDUtil {
             // 型号
             // 转链链接
             // 默认数量为1
-            order.append("单\n").append("H\n") // 分销标记
+            order.append("生\n").append("H\n") // 分销标记
                     .append(modelNumber).append("\n") // 型号
                     .append("\n") // 转链链接
                     .append("1\n").append(name).append(fullAddress); // 地址+联系信息
diff --git a/src/main/java/cn/van/business/util/WxMessageConsumer.java b/src/main/java/cn/van/business/util/WxMessageConsumer.java
index d744fb1..360f072 100644
--- a/src/main/java/cn/van/business/util/WxMessageConsumer.java
+++ b/src/main/java/cn/van/business/util/WxMessageConsumer.java
@@ -108,15 +108,19 @@ public class WxMessageConsumer {
                 jdUtils.manman(msg, fromWxid);
                 return;
             }
-        }
-        // 超级管理员内部群
-        if (chatRoom_admin_inner.contains(fromWxid)) {
-            if (msg.startsWith("单")) {
-                logger.info("消息以单开头，处理单指令消息");
-                jdUtils.sendOrderToWxByOrderD(msg.replace("单", ""), fromWxid);
-                return;
+            if (msg.startsWith("生")){
+                logger.info("消息以生开头，处理单指令消息");
+                jdUtils.sendOrderToWxByOrderD(msg.replace("生", ""), fromWxid);
             }
         }
+        // 超级管理员内部群
+        //if (chatRoom_admin_inner.contains(fromWxid)) {
+        //    if (msg.startsWith("表")) {
+        //        logger.info("消息以表开头，处理单指令消息");
+        //        jdUtils.sendOrderToWxByOrderD(msg.replace("表", ""), fromWxid);
+        //        return;
+        //    }
+        //}
         // 可以对外的群聊
         if (!chatRoom_admin.contains(fromWxid) && !chatRoom_admin_pl.contains(fromWxid)) {
             logger.info("不是白名单群聊，不处理");