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:
van
2026-09-07 19:27:22 +08:00
parent a169a554b9
commit 3b5081ce25
11 changed files with 199 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jarvis/TencentDocController.java
+9 -9
View File
@@ -448,9 +448,9 @@ public class TencentDocController extends BaseController {
return AjaxResult.error("未找到订单信息");
}
// 检查是否有物流链接
if (order.getLogisticsLink() == null || order.getLogisticsLink().trim().isEmpty()) {
return AjaxResult.error("订单缺少物流链接，无法自动发货");
// 检查是否有物流链接或物流单号
if (!order.hasLogisticsInfo()) {
return AjaxResult.error("订单缺少物流链接或物流单号，无法自动发货");
}
// 上传物流信息到腾讯文档
@@ -1480,8 +1480,8 @@ public class TencentDocController extends BaseController {
continue;
}
if (order.getLogisticsLink() != null && !order.getLogisticsLink().trim().isEmpty()) {
String logisticsLink = order.getLogisticsLink().trim();
if (order.hasLogisticsInfo()) {
String logisticsLink = order.resolveLogisticsDocValue();
// 从status字段中提取手机号码
String phone = null;
@@ -1526,14 +1526,14 @@ public class TencentDocController extends BaseController {
order.getTencentDocPushed() != null && order.getTencentDocPushed() == 1 ? "是" : "否");
} else {
errorCount++;
log.warn("订单物流链接为空 - 单号: {}, 行号: {}", orderNo, excelRow);
log.warn("订单物流链接/单号为空 - 单号: {}, 行号: {}", orderNo, excelRow);
// 记录错误详情
Map<String, Object> errorLog = new java.util.HashMap<>();
errorLog.put("orderNo", orderNo);
errorLog.put("row", excelRow);
errorLog.put("errorType", "物流链接为空");
errorLog.put("errorMessage", "订单物流链接为空");
errorLog.put("errorMessage", "订单缺少物流链接或物流单号");
errorLogs.add(errorLog);
}
} catch (Exception e) {
@@ -1760,8 +1760,8 @@ public class TencentDocController extends BaseController {
log.info("✓ 先清除单元格内容 - 行: {}, 列: {}", row, logisticsLinkColumn);
}
// 1. 更新物流单号（超链接类型）
requests.add(buildUpdateCellRequest(sheetId, row - 1, logisticsLinkColumn, logisticsLink, true));
// 1. 更新物流单号（链接写超链接，纯单号写文本）
requests.add(buildUpdateCellRequest(sheetId, row - 1, logisticsLinkColumn, logisticsLink, JDOrder.isHttpUrl(logisticsLink)));
// 2. 更新"下单电话"列（如果存在且提取到了手机号码）
String phone = update.getString("phone");