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-19 16:47:42 +08:00
parent 0dae6a31fe
commit 98f8dea2cd
1 changed files with 12 additions and 13 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

@@ -259,11 +259,11 @@ public class InstructionServiceImpl implements IInstructionService {
StringBuilder summary = new StringBuilder(); StringBuilder summary = new StringBuilder();
List<Map.Entry<String, Long>> modelEntries = new ArrayList<>(byModel.entrySet()); List<Map.Entry<String, Long>> modelEntries = new ArrayList<>(byModel.entrySet());
modelEntries.sort(Comparator.comparing(en -> en.getKey() == null ? "" : en.getKey())); modelEntries.sort(Comparator.comparing(en -> en.getKey() == null ? "" : en.getKey()));
// 记录该分组中每个型号的最高单价订单 // 记录该分组中每个型号的最高单价订单
Map<String, JDOrder> groupMaxPriceOrders = new HashMap<>(); Map<String, JDOrder> groupMaxPriceOrders = new HashMap<>();
Map<String, Integer> groupModelCounts = new HashMap<>(); Map<String, Integer> groupModelCounts = new HashMap<>();
for (Map.Entry<String, Long> em : modelEntries) { for (Map.Entry<String, Long> em : modelEntries) {
int c = em.getValue().intValue(); int c = em.getValue().intValue();
totalCount += c; totalCount += c;
@@ -414,15 +414,14 @@ public class InstructionServiceImpl implements IInstructionService {
static { static {
/* /*
18539187615 18539187615
15738558087 15738558087
13243039070 13243039070
15639125541 15639125541
17530176250 */ 17530176250 */
phoneWithTF.add("18539187615");
phoneWithTF.add("15738558087");
phoneWithTF.add("13243039070"); phoneWithTF.add("13243039070");
phoneWithTF.add("15639125541"); phoneWithTF.add("15639125541");
phoneWithTF.add("17530176250");
} }
private String handleTF(String input) { private String handleTF(String input) {
@@ -931,7 +930,7 @@ private String handleTF(String input) {
*/ */
private String truncateDistributionMark(String v) { private String truncateDistributionMark(String v) {
if (v == null) return ""; if (v == null) return "";
// 如果长度大于4，进行截取 // 如果长度大于4，进行截取
if (v.length() > 4) { if (v.length() > 4) {
// 查找第一个左括号的位置 // 查找第一个左括号的位置
@@ -944,15 +943,15 @@ private String handleTF(String input) {
return v.substring(0, 4); return v.substring(0, 4);
} }
} }
return v; return v;
} }
private String mapDistribution(String v) { private String mapDistribution(String v) {
if (v == null) return ""; if (v == null) return "";
String processedV = truncateDistributionMark(v); String processedV = truncateDistributionMark(v);
if (processedV.startsWith("H")) return "鸿"; if (processedV.startsWith("H")) return "鸿";
if (processedV.startsWith("F")) return "凡"; if (processedV.startsWith("F")) return "凡";
return ""; return "";