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:
荒
2025-10-10 22:10:04 +08:00
parent 08332bf638
commit 898006754f
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,7 +199,7 @@ public class InstructionServiceImpl implements IInstructionService {
int i = 0;
for (JDOrder o : matched) {
i++;
sb.append(i).append(", 单：").append(nvl(o.getRemark())).append("\n分销标记：").append(nvl(o.getDistributionMark())).append("\n型号：").append(nvl(o.getModelNumber())).append("\n链接：").append(nvl(o.getLink())).append("\n下单付款：").append(nvl(o.getPaymentAmount())).append("\n后返金额：").append(nvl(o.getRebateAmount())).append("\n地址：").append(nvl(o.getAddress())).append("\n物流链接：").append(nvl(o.getLogisticsLink())).append("\n订单号：").append(nvl(o.getOrderId())).append("\n下单人：").append(nvl(o.getBuyer())).append("\n下单时间：").append(nvl(o.getOrderTime())).append("\n备注：").append(nvl(o.getStatus())).append("\n━━━━━━━━━━━━\n");
sb.append(i).append(", 单：").append(nvl(o.getRemark())).append("\n分销标记：").append(truncateDistributionMark(nvl(o.getDistributionMark()))).append("\n型号：").append(nvl(o.getModelNumber())).append("\n链接：").append(nvl(o.getLink())).append("\n下单付款：").append(nvl(o.getPaymentAmount())).append("\n后返金额：").append(nvl(o.getRebateAmount())).append("\n地址：").append(nvl(o.getAddress())).append("\n物流链接：").append(nvl(o.getLogisticsLink())).append("\n订单号：").append(nvl(o.getOrderId())).append("\n下单人：").append(nvl(o.getBuyer())).append("\n下单时间：").append(nvl(o.getOrderTime())).append("\n备注：").append(nvl(o.getStatus())).append("\n━━━━━━━━━━━━\n");
}
return Collections.singletonList(sb.toString());
}
@@ -301,7 +301,7 @@ public class InstructionServiceImpl implements IInstructionService {
}
// 拆分为多条消息 - 订单详情
StringBuilder infoSingle = new StringBuilder();
infoSingle.append("分销标记：").append(dm).append("\n").append(summary).append(detail).append("\n");
infoSingle.append("分销标记：").append(truncateDistributionMark(dm)).append("\n").append(summary).append(detail).append("\n");
outputs.add(infoSingle.toString().trim());
}
@@ -925,23 +925,35 @@ private String handleTF(String input) {
return LocalDate.of(y, mo, d);
}
private String mapDistribution(String v) {
/**
* 截取分销标记，如果长度大于4则进行截取
* @param v 原始分销标记
* @return 截取后的分销标记
*/
private String truncateDistributionMark(String v) {
if (v == null) return "";
// 如果长度大于4，进行截取
String processedV = v;
if (v.length() > 4) {
// 查找第一个左括号的位置
int leftParenIndex = v.indexOf('(');
if (leftParenIndex > 0) {
// 截取到左括号之前的部分
processedV = v.substring(0, leftParenIndex);
return v.substring(0, leftParenIndex);
} else {
// 如果没有括号，直接截取前4个字符
processedV = v.substring(0, 4);
return v.substring(0, 4);
}
}
return v;
}
private String mapDistribution(String v) {
if (v == null) return "";
String processedV = truncateDistributionMark(v);
if (processedV.startsWith("H")) return "鸿";
if (processedV.startsWith("F")) return "凡";
return "";
@@ -970,3 +982,4 @@ private String handleTF(String input) {
}