From 383af37178f9c4e80de209fd778f0b9d9aa183d9 Mon Sep 17 00:00:00 2001
From: Van0313 <60689272+Van0313@users.noreply.github.com>
Date: Tue, 3 Jun 2025 22:16:04 +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 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java
index f93c7df..bbf0bfd 100644
--- a/src/main/java/cn/van/business/util/JDUtil.java
+++ b/src/main/java/cn/van/business/util/JDUtil.java
@@ -2035,8 +2035,6 @@ public class JDUtil {
 
                 // 总统计信息
                 StringBuilder summaryBuilder = new StringBuilder();
-                double totalPayment = 0;
-                double totalRebate = 0;
                 int totalCount = 0;
 
                 // 按 modelNumber 再次分组
@@ -2048,11 +2046,7 @@ public class JDUtil {
                     List<JDOrder> modelOrders = modelEntry.getValue();
 
                     int count = modelOrders.size();
-                    double paymentSum = modelOrders.stream().mapToDouble(order -> order.getPaymentAmount() != null ? order.getPaymentAmount() : 0.0).sum();
-                    double rebateSum = modelOrders.stream().mapToDouble(order -> order.getRebateAmount() != null ? order.getRebateAmount() : 0.0).sum();
 
-                    totalPayment += paymentSum;
-                    totalRebate += rebateSum;
                     totalCount += count;
 
                     summaryBuilder.append("型号：").append(modelNumber != null ? modelNumber : "未知")
@@ -2065,10 +2059,12 @@ public class JDUtil {
 
                 // 发送总统计消息
                 //wxUtil.sendTextMessage(fromWxid, "分销标记：" + distributionMark + "\n" + summaryBuilder, 1, fromWxid, true);
-
+                List<JDOrder> sortedOrders = orders.stream()
+                        .sorted(Comparator.comparing(JDOrder::getRemark, Comparator.nullsFirst(String::compareTo)))
+                        .toList();
                 // 发送详细订单列表
                 StringBuilder detailBuilder = new StringBuilder();
-                for (JDOrder order : orders) {
+                for (JDOrder order : sortedOrders) {
                     detailBuilder.append("单：").append(order.getRemark() != null ? order.getRemark() : "未提供")
                             .append("\n型号：").append(order.getModelNumber() != null ? order.getModelNumber() : "未提供")
                             .append("\n下单付款：").append(order.getPaymentAmount() != null ? String.format("%.2f", order.getPaymentAmount()) : "0.00").append(" 元")