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 505202f..16d2097 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 @@ -836,14 +836,14 @@ private String handleTF(String input) { } private String handlePDD(String input) { - return handlePDDWithMark(input, "拼多多", "PDD", true); + return handlePDDWithMark(input, "拼多多", "PDD"); } 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 // 赵政委[6947] @@ -879,9 +879,7 @@ private String handleTF(String input) { Pattern orderNoPattern = Pattern.compile("拼多多(\\d+-\\d+)"); Matcher matcher = orderNoPattern.matcher(firstLine); if (matcher.find()) { - if (needThirdPartyOrderNo) { - thirdPartyOrderNo = matcher.group(1); // 提取订单号部分(不含"拼多多") - } + thirdPartyOrderNo = matcher.group(1); // 提取订单号部分(不含"拼多多") isNewFormat = true; nameLineIndex = 1; // 新格式下,姓名在第二行 } @@ -892,9 +890,7 @@ private String handleTF(String input) { Pattern orderNoPattern2 = Pattern.compile("^(\\d+-\\d+)$"); Matcher matcher2 = orderNoPattern2.matcher(secondLine); if (matcher2.find()) { - if (needThirdPartyOrderNo) { - thirdPartyOrderNo = matcher2.group(1); // 提取订单号 - } + thirdPartyOrderNo = matcher2.group(1); // 提取订单号 isNewFormat = true; nameLineIndex = 2; // 多行格式下,姓名在第三行 } else {