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

Merge remote-tracking branch '群晖/master'

Browse Source
This commit is contained in:
雷欧（林平凡）
2025-06-04 13:37:09 +08:00
parent b44b719cff a1ad742d96
commit c4ef932dba
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2035,8 +2035,6 @@ public class JDUtil {
// 总统计信息 // 总统计信息
StringBuilder summaryBuilder = new StringBuilder(); StringBuilder summaryBuilder = new StringBuilder();
double totalPayment = 0;
double totalRebate = 0;
int totalCount = 0; int totalCount = 0;
// 按 modelNumber 再次分组 // 按 modelNumber 再次分组
@@ -2048,11 +2046,7 @@ public class JDUtil {
List<JDOrder> modelOrders = modelEntry.getValue(); List<JDOrder> modelOrders = modelEntry.getValue();
int count = modelOrders.size(); 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; totalCount += count;
summaryBuilder.append("型号：").append(modelNumber != null ? modelNumber : "未知") summaryBuilder.append("型号：").append(modelNumber != null ? modelNumber : "未知")
@@ -2064,10 +2058,12 @@ public class JDUtil {
// 发送总统计消息 // 发送总统计消息
//wxUtil.sendTextMessage(fromWxid, "分销标记：" + distributionMark + "\n" + summaryBuilder, 1, fromWxid, true); //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(); StringBuilder detailBuilder = new StringBuilder();
for (JDOrder order : orders) { for (JDOrder order : sortedOrders) {
detailBuilder.append("单：").append(order.getRemark() != null ? order.getRemark() : "未提供") detailBuilder.append("单：").append(order.getRemark() != null ? order.getRemark() : "未提供")
.append("\n型号：").append(order.getModelNumber() != null ? order.getModelNumber() : "未提供") .append("\n型号：").append(order.getModelNumber() != null ? order.getModelNumber() : "未提供")
.append("\n下单付款：").append(order.getPaymentAmount() != null ? String.format("%.2f", order.getPaymentAmount()) : "0.00").append(" 元") .append("\n下单付款：").append(order.getPaymentAmount() != null ? String.format("%.2f", order.getPaymentAmount()) : "0.00").append(" 元")