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
2025-11-11 12:41:21 +08:00
parent c8b15275a4
commit 142b395dbe
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
View File

@@ -313,7 +313,13 @@ public class InstructionServiceImpl implements IInstructionService {
for (JDOrder o : sorted) { for (JDOrder o : sorted) {
if ("拍错退款".equals(o.getStatus())) continue; if ("拍错退款".equals(o.getStatus())) continue;
idx++; 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(); StringBuilder infoSingle = new StringBuilder();
@@ -484,6 +490,7 @@ public class InstructionServiceImpl implements IInstructionService {
detail.append("\n").append(idx).append(" ────────────\n") detail.append("\n").append(idx).append(" ────────────\n")
.append("单：").append(o.getRemark() != null ? o.getRemark() : "未提供").append("\n") .append("单：").append(o.getRemark() != null ? o.getRemark() : "未提供").append("\n")
.append("备注：").append(o.getStatus() != null ? o.getStatus() : " ").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.getModelNumber() != null ? o.getModelNumber() : "未提供").append("\n")
.append("地址：").append(o.getAddress() != null ? o.getAddress() : "未提供").append("\n") .append("地址：").append(o.getAddress() != null ? o.getAddress() : "未提供").append("\n")
.append("物流链接：\n").append(o.getLogisticsLink() != null ? o.getLogisticsLink() : "无"); .append("物流链接：\n").append(o.getLogisticsLink() != null ? o.getLogisticsLink() : "无");

9
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/LogisticsServiceImpl.java
View File

@@ -131,12 +131,9 @@ public class LogisticsServiceImpl implements ILogisticsService {
String distributionMark = order.getDistributionMark() != null ? order.getDistributionMark() : "未知"; String distributionMark = order.getDistributionMark() != null ? order.getDistributionMark() : "未知";
pushContent.append(distributionMark).append("\n"); pushContent.append(distributionMark).append("\n");
// PDD订单包含第三方单号，F订单不包含 String thirdPartyOrderNo = order.getThirdPartyOrderNo();
if ("PDD".equals(distributionMark)) { if (thirdPartyOrderNo != null && !thirdPartyOrderNo.trim().isEmpty()) {
String thirdPartyOrderNo = order.getThirdPartyOrderNo(); pushContent.append("第三方单号：").append(thirdPartyOrderNo).append("\n");
if (thirdPartyOrderNo != null && !thirdPartyOrderNo.trim().isEmpty()) {
pushContent.append("第三方单号：").append(thirdPartyOrderNo).append("\n");
}
} }
// 型号 // 型号