From 142b395dbe1852f363cfe050dc2ac446efc74271 Mon Sep 17 00:00:00 2001 From: Leo Date: Tue, 11 Nov 2025 12:41:21 +0800 Subject: [PATCH] 1 --- .../jarvis/service/impl/InstructionServiceImpl.java | 9 ++++++++- .../ruoyi/jarvis/service/impl/LogisticsServiceImpl.java | 9 +++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java index 16d2097..64b56f9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java @@ -313,7 +313,13 @@ public class InstructionServiceImpl implements IInstructionService { for (JDOrder o : sorted) { if ("拍错退款".equals(o.getStatus())) continue; idx++; - detail.append("\n").append(idx).append(" ────────────\n").append("单：").append(o.getRemark() != null ? o.getRemark() : "未提供").append("\n备注：").append(o.getStatus() != null ? o.getStatus() : " ").append("\n型号：").append(o.getModelNumber() != null ? o.getModelNumber() : "未提供").append("\n地址：").append(o.getAddress() != null ? o.getAddress() : "未提供").append("\n物流链接：\n").append(o.getLogisticsLink() != null ? o.getLogisticsLink() : "无"); + detail.append("\n").append(idx).append(" ────────────\n") + .append("单：").append(o.getRemark() != null ? o.getRemark() : "未提供").append("\n") + .append("备注：").append(o.getStatus() != null ? o.getStatus() : " ").append("\n") + .append("第三方单号：").append(o.getThirdPartyOrderNo() != null && !o.getThirdPartyOrderNo().isEmpty() ? o.getThirdPartyOrderNo() : "无").append("\n") + .append("型号：").append(o.getModelNumber() != null ? o.getModelNumber() : "未提供").append("\n") + .append("地址：").append(o.getAddress() != null ? o.getAddress() : "未提供").append("\n") + .append("物流链接：\n").append(o.getLogisticsLink() != null ? o.getLogisticsLink() : "无"); } // 拆分为多条消息 - 订单详情 StringBuilder infoSingle = new StringBuilder(); @@ -484,6 +490,7 @@ public class InstructionServiceImpl implements IInstructionService { detail.append("\n").append(idx).append(" ────────────\n") .append("单：").append(o.getRemark() != null ? o.getRemark() : "未提供").append("\n") .append("备注：").append(o.getStatus() != null ? o.getStatus() : " ").append("\n") + .append("第三方单号：").append(o.getThirdPartyOrderNo() != null && !o.getThirdPartyOrderNo().isEmpty() ? o.getThirdPartyOrderNo() : "无").append("\n") .append("型号：").append(o.getModelNumber() != null ? o.getModelNumber() : "未提供").append("\n") .append("地址：").append(o.getAddress() != null ? o.getAddress() : "未提供").append("\n") .append("物流链接：\n").append(o.getLogisticsLink() != null ? o.getLogisticsLink() : "无"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java index f01c566..e302f21 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java @@ -131,12 +131,9 @@ public class LogisticsServiceImpl implements ILogisticsService { String distributionMark = order.getDistributionMark() != null ? order.getDistributionMark() : "未知"; pushContent.append(distributionMark).append("\n"); - // PDD订单包含第三方单号，F订单不包含 - if ("PDD".equals(distributionMark)) { - String thirdPartyOrderNo = order.getThirdPartyOrderNo(); - if (thirdPartyOrderNo != null && !thirdPartyOrderNo.trim().isEmpty()) { - pushContent.append("第三方单号：").append(thirdPartyOrderNo).append("\n"); - } + String thirdPartyOrderNo = order.getThirdPartyOrderNo(); + if (thirdPartyOrderNo != null && !thirdPartyOrderNo.trim().isEmpty()) { + pushContent.append("第三方单号：").append(thirdPartyOrderNo).append("\n"); } // 型号