From 98f8dea2cdddbc6685f66c545e2823ec2e68ee8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8D=92?= Date: Sun, 19 Oct 2025 16:47:42 +0800 Subject: [PATCH] 1 --- .../service/impl/InstructionServiceImpl.java | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 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 a7f73f5..c092597 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 @@ -259,11 +259,11 @@ public class InstructionServiceImpl implements IInstructionService { StringBuilder summary = new StringBuilder(); List> modelEntries = new ArrayList<>(byModel.entrySet()); modelEntries.sort(Comparator.comparing(en -> en.getKey() == null ? "" : en.getKey())); - + // 记录该分组中每个型号的最高单价订单 Map groupMaxPriceOrders = new HashMap<>(); Map groupModelCounts = new HashMap<>(); - + for (Map.Entry em : modelEntries) { int c = em.getValue().intValue(); totalCount += c; @@ -414,15 +414,14 @@ public class InstructionServiceImpl implements IInstructionService { static { /* 18539187615 -15738558087 -13243039070 -15639125541 -17530176250 */ - phoneWithTF.add("18539187615"); - phoneWithTF.add("15738558087"); + 15738558087 + 13243039070 + 15639125541 + 17530176250 */ + phoneWithTF.add("13243039070"); phoneWithTF.add("15639125541"); - phoneWithTF.add("17530176250"); + } private String handleTF(String input) { @@ -931,7 +930,7 @@ private String handleTF(String input) { */ private String truncateDistributionMark(String v) { if (v == null) return ""; - + // 如果长度大于4,进行截取 if (v.length() > 4) { // 查找第一个左括号的位置 @@ -944,15 +943,15 @@ private String handleTF(String input) { 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 "";