CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
Leo
2026-01-26 22:31:46 +08:00
parent caa36c4966
commit 72ff30567b
4 changed files with 97 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/TencentDocController.java
View File

@@ -1566,8 +1566,9 @@ public class TencentDocController extends BaseController {
log.info(logMsg);
// 更新订单的推送状态（重新查询订单，避免使用旧对象）
JDOrder orderToUpdate = null;
try {
JDOrder orderToUpdate = jdOrderService.selectJDOrderByThirdPartyOrderNo(expectedOrderNo);
orderToUpdate = jdOrderService.selectJDOrderByThirdPartyOrderNo(expectedOrderNo);
if (orderToUpdate != null) {
orderToUpdate.setTencentDocPushed(1);
orderToUpdate.setTencentDocPushTime(new java.util.Date());
@@ -1597,6 +1598,10 @@ public class TencentDocController extends BaseController {
if (phone != null) {
successLog.put("phone", phone);
}
// 添加型号信息
if (orderToUpdate != null && orderToUpdate.getModelNumber() != null) {
successLog.put("modelNumber", orderToUpdate.getModelNumber());
}
// 检查是否为物流链接更新（复用之前的变量）
if (Boolean.TRUE.equals(isLinkUpdated)) {
@@ -2766,9 +2771,6 @@ public class TencentDocController extends BaseController {
content.append("【批量同步-腾讯文档同步成功】\n\n");
}
content.append(String.format("✓ 成功填充: %d 条\n", filledCount));
if (skippedCount > 0) {
content.append(String.format("⊘ 跳过: %d 条\n", skippedCount));
}
if (errorCount > 0) {
content.append(String.format("✗ 错误: %d 条\n", errorCount));
}
@@ -2783,20 +2785,43 @@ public class TencentDocController extends BaseController {
content.append("\n");
if (!successLogs.isEmpty()) {
// 统计今天的型号
Map<String, Integer> modelCountMap = new java.util.HashMap<>();
for (Map<String, Object> log : successLogs) {
String modelNumber = (String) log.get("modelNumber");
if (modelNumber != null && !modelNumber.trim().isEmpty()) {
modelCountMap.put(modelNumber, modelCountMap.getOrDefault(modelNumber, 0) + 1);
} else {
modelCountMap.put("未知型号", modelCountMap.getOrDefault("未知型号", 0) + 1);
}
}
// 显示今天的型号统计
if (!modelCountMap.isEmpty()) {
content.append("【今天的型号统计】\n");
List<Map.Entry<String, Integer>> sortedModels = new java.util.ArrayList<>(modelCountMap.entrySet());
sortedModels.sort((a, b) -> b.getValue().compareTo(a.getValue())); // 按数量降序排序
for (Map.Entry<String, Integer> entry : sortedModels) {
content.append(String.format("型号: %s 数量: %d\n", entry.getKey(), entry.getValue()));
}
content.append("\n");
}
// 显示每一单具体的型号
content.append("【成功详情】\n");
// 最多显示20条详细记录，避免消息过长
int maxDisplay = Math.min(20, successLogs.size());
for (int i = 0; i < maxDisplay; i++) {
Map<String, Object> log = successLogs.get(i);
String orderNo = (String) log.get("orderNo");
Integer row = (Integer) log.get("row");
String logisticsLink = (String) log.get("logisticsLink");
String phone = (String) log.get("phone");
String modelNumber = (String) log.get("modelNumber");
content.append(String.format("%d. 单号: %s\n", i + 1, orderNo));
content.append(String.format(" 行号: %d\n", row));
if (phone != null && !phone.isEmpty()) {
content.append(String.format(" 电话: %s\n", phone));
if (modelNumber != null && !modelNumber.trim().isEmpty()) {
content.append(String.format(" 型号: %s\n", modelNumber));
} else {
content.append(" 型号: 未知\n");
}
// 检查是否为物流链接更新