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

Revert "1"

Browse Source 
This reverts commit e79e7081ee.
This commit is contained in:
Leo
2025-11-11 12:30:45 +08:00
parent a61003fb7c
commit c8b15275a4
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -836,14 +836,14 @@ private String handleTF(String input) {
} }
private String handlePDD(String input) { private String handlePDD(String input) {
return handlePDDWithMark(input, "拼多多", "PDD", true); return handlePDDWithMark(input, "拼多多", "PDD");
} }
private String handlePDDW(String input) { private String handlePDDW(String input) {
return handlePDDWithMark(input, "拼多多 W", "PDD-W", false); return handlePDDWithMark(input, "拼多多 W", "PDD-W");
} }
private String handlePDDWithMark(String input, String commandKeyword, String distributionMark, boolean needThirdPartyOrderNo) { private String handlePDDWithMark(String input, String commandKeyword, String distributionMark) {
// 拼多多新格式： // 拼多多新格式：
// <指令>251102-457567158704072 // <指令>251102-457567158704072
// 赵政委[6947] // 赵政委[6947]
@@ -879,9 +879,7 @@ private String handleTF(String input) {
Pattern orderNoPattern = Pattern.compile("拼多多(\\d+-\\d+)"); Pattern orderNoPattern = Pattern.compile("拼多多(\\d+-\\d+)");
Matcher matcher = orderNoPattern.matcher(firstLine); Matcher matcher = orderNoPattern.matcher(firstLine);
if (matcher.find()) { if (matcher.find()) {
if (needThirdPartyOrderNo) {
thirdPartyOrderNo = matcher.group(1); // 提取订单号部分（不含"拼多多"） thirdPartyOrderNo = matcher.group(1); // 提取订单号部分（不含"拼多多"）
}
isNewFormat = true; isNewFormat = true;
nameLineIndex = 1; // 新格式下，姓名在第二行 nameLineIndex = 1; // 新格式下，姓名在第二行
} }
@@ -892,9 +890,7 @@ private String handleTF(String input) {
Pattern orderNoPattern2 = Pattern.compile("^(\\d+-\\d+)$"); Pattern orderNoPattern2 = Pattern.compile("^(\\d+-\\d+)$");
Matcher matcher2 = orderNoPattern2.matcher(secondLine); Matcher matcher2 = orderNoPattern2.matcher(secondLine);
if (matcher2.find()) { if (matcher2.find()) {
if (needThirdPartyOrderNo) {
thirdPartyOrderNo = matcher2.group(1); // 提取订单号 thirdPartyOrderNo = matcher2.group(1); // 提取订单号
}
isNewFormat = true; isNewFormat = true;
nameLineIndex = 2; // 多行格式下，姓名在第三行 nameLineIndex = 2; // 多行格式下，姓名在第三行
} else { } else {