From dbbd1de26d536badf4edc3372f293c8097f58211 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: Mon, 2 Dec 2024 11:35:32 +0800
Subject: [PATCH] 1

---
 .../java/cn/van/business/util/JDUtils.java    |  1 +
 .../java/cn/van/business/util/OrderUtil.java  | 19 ++++++++++---------
 .../java/cn/van/business/util/WXUtil.java     | 10 +++++-----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java
index 3da88a8..970586c 100644
--- a/src/main/java/cn/van/business/util/JDUtils.java
+++ b/src/main/java/cn/van/business/util/JDUtils.java
@@ -354,6 +354,7 @@ public class JDUtils {
                 content.append(":::高级菜单:::\r");
                 content.append("菜单：京+高级+命令 \n 如： 京高级违规30\r");
                 content.append("京高级违规+整数\r");
+                content.append("京高级+订单号\r\"");
                 content.append("京高级SKU+sku\\r\"");
                 break;
             case "今日统计": {
diff --git a/src/main/java/cn/van/business/util/OrderUtil.java b/src/main/java/cn/van/business/util/OrderUtil.java
index 14f2857..aab9f35 100644
--- a/src/main/java/cn/van/business/util/OrderUtil.java
+++ b/src/main/java/cn/van/business/util/OrderUtil.java
@@ -60,19 +60,20 @@ public class OrderUtil {
         ValidCodeConverter converter = new ValidCodeConverter();
         String orderInfo =
                 //+ "订单+sku：" + orderRow.getId() + "\r"
-                "订单号：" + orderRow.getOrderId() + "(" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" +
+                "订单号：" + orderRow.getOrderId() + "  (" + (orderRow.getPlus() == 1 ? "plus" : "非plus") + ")\r" +
 
-                        "最新订单状态：" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r" +
+                        "最新订单状态：" + (converter.getCodeDescription(orderRow.getValidCode())) + "\r"
 
-                        "商品名称：" + orderRow.getSkuName() + "\r"
-                        + "商品单价：" + orderRow.getPrice() + "\r"
-                        + "商品数量：" + orderRow.getSkuNum() + "\r"
-                        + "商品总价：" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r"
-                        + "预估计佣金额：" + orderRow.getEstimateCosPrice() + "\n"
+                        +"商品名称：" + orderRow.getSkuName() + "\r"
+                        //+ "商品单价：" + orderRow.getPrice() + "\r"
+                        //+ "商品数量：" + orderRow.getSkuNum() + "\r"
+                        //+ "商品总价：" + (orderRow.getPrice() * orderRow.getSkuNum()) + "\r"
+                        //+ "预估计佣金额：" + orderRow.getEstimateCosPrice() + "\n"
 
-                        + "佣金比例：" + orderRow.getCommissionRate() + "%\r\r"
-                        + "推客的预估佣金：" + orderRow.getEstimateFee() + "\r"
                         + "实际计算佣金的金额：" + orderRow.getActualCosPrice() + "\r"
+                        + "佣金比例：" + orderRow.getCommissionRate() + "%\r"
+                        + "推客的预估佣金：" + orderRow.getEstimateFee() + "\r\n"
+
                         + "下单时间：" + formatter.format(orderRow.getOrderTime()) + "\r"
                         + "完成时间：" + (orderRow.getFinishTime() != null ? formatter.format(orderRow.getFinishTime()) : "未完成") + "\r\n";
         if (oldValidCode != -100) {
diff --git a/src/main/java/cn/van/business/util/WXUtil.java b/src/main/java/cn/van/business/util/WXUtil.java
index 1463bca..524ddfc 100644
--- a/src/main/java/cn/van/business/util/WXUtil.java
+++ b/src/main/java/cn/van/business/util/WXUtil.java
@@ -102,13 +102,13 @@ public class WXUtil {
         //logger.info("发送文本消息 msgType: {} wxid: {} fromwxid: {} content: {}", msgType, wxid, fromwxid, content);
         // 先在content顶部插入时间戳
         // 因为引入了消息队列，所以在每条消息都加上时间戳 格式化成 yyyy-MM-dd HH:mm:ss
-        content = "[" + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "] \r" + content;
+        content = "[ " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " ] \r" + content;
 
         // 如果是自己的微信，所有信息都加上少爷
-        if (wxid.equals(super_admin_wxid) || fromwxid.equals(super_admin_wxid)) {
-            content = "超管： 凡神 ！\r\n" + content;
-        }
-        List<String> strings = splitStringByLength(content, 3072);
+        //if (wxid.equals(super_admin_wxid) || fromwxid.equals(super_admin_wxid)) {
+        //    content = "超管： 凡神 ！\r\n" + content;
+        //}
+        List<String> strings = splitStringByLength(content, 2048);
         int count = 1;
         for (String string : strings) {