From 9d7718b8acf9770d7b9335019b19aeed7320483b Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 03 十一月 2025 12:58:39 +0800
Subject: [PATCH] 定时任务订单上报使用orderThreadPool线程池

---
 src/main/java/com/zy/common/service/CommonService.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 33b8dd8..73609c5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -179,9 +179,11 @@
         if (locMasts.size() <= 4) {
             switch (locType) {
                 case 0:
+                    return getLocNoRunNew(ioType, sourceSite, 1);
+                case 1:
+                    return getLocNoRunNew(ioType, sourceSite, 2);
                 case 2:
                     return getLocNoRunNew(ioType, sourceSite, 3);
-                case 1:
                 case 3:
                     throw new CoolException("褰撳墠搴撲綅鍓╀綑鍥涗釜鐢ㄤ簬绉诲簱锛屾棤娉曞崰鐢細" + locType);
                 default:
@@ -194,7 +196,7 @@
                locMast = first.get();
         } else {
             // 娣卞簱浣嶉噷闈㈡病鏈変粠娴呭簱浣嶉噷闈㈠彇
-            Optional<LocMast> first2 = locMasts.stream().filter(o -> o.getRow1() == 2 || o.getRow1() == 3 || o.getRow1() == 5 || o.getRow1() == 7).findFirst();
+            Optional<LocMast> first2 = locMasts.stream().filter(o -> o.getRow1() == 2 || o.getRow1() == 3 || o.getRow1() == 6 || o.getRow1() == 7).findFirst();
             if(first2.isPresent()) {
                 locMast = first2.get();
             }

--
Gitblit v1.9.1