fix:修复通过临时规划单和系统编号查询结果一直是临时单号的问题

src/main/java/com/chint/application/out/OrderOutController.java

@@ -64,8 +64,9 @@ public class OrderOutController {
         String billcode = queryData.getBillcode();
         String sysCode = queryData.getSysCode();
         RouteOrder routeOrder = routeRepository.findTempRouteOrderBySysCodeAndBillCode(sysCode, billcode);
-        if (routeOrder == null) {
+        RouteOrder routeOrderFromDB = orderQuery.queryByBillCodeAndSysCode(billcode, sysCode);
-            routeOrder = orderQuery.queryByBillCodeAndSysCode(billcode, sysCode);
+        if (routeOrderFromDB != null) {
+            routeOrder = routeOrderFromDB;
         }
         return Result.Success(SUCCESS, orderQuery.queryRouteRes(routeOrder.reloadStatus()));
     }

src/main/java/com/chint/infrastructure/cache/RouteCacheService.java

@@ -58,8 +58,7 @@ public class RouteCacheService {
     }
 
     public RouteOrder reloadRouteOrderInCache(RouteOrder routeOrder) {
-        routeCacheManage.invalidateRouteCache(routeOrder.getRouteId());
+        updateRouteCache(routeOrder);
-        routeCacheManage.cacheRouteOrder(routeOrder);
         return routeOrder;
     }
 
@@ -110,36 +109,45 @@ public class RouteCacheService {
     }
 
     public RouteOrder getRouteByFakeOrderNoAndSysCode(String fakeOrderNo, String sysCode) {
-        Long routeId = routeCacheManage.cacheFakeOrderNoAndSysCodeMapRouteId(fakeOrderNo, sysCode, null);
+        return getRouteByOrderNoAndSysCode(fakeOrderNo, sysCode, true);
-        if (routeId == null) {
-            routeCacheManage.invalidateFakeOrderNoAndSysCodeMapRouteId(fakeOrderNo, sysCode);
-        }
-        RouteOrder routeOrder = jdbcRouteRepository.findByApproveOrderNo_FakeOrderNoAndApproveOrderNo_SysCode(fakeOrderNo, sysCode);
-        if (routeOrder == null) {
-            routeCacheManage.invalidateFakeOrderNoAndSysCodeMapRouteId(fakeOrderNo, sysCode);
-            return null;
-        } else {
-            routeOrder.reloadStatus();
-            routeCacheManage.cacheFakeOrderNoAndSysCodeMapRouteId(fakeOrderNo, sysCode, routeOrder);
-            return getFromCacheOrSaveToCache(routeOrder.getRouteId());
-        }
     }
 
     public RouteOrder getRouteByActualOrderNoAndSysCode(String actualOrderNo, String sysCode) {
-        Long routeId = routeCacheManage.cacheActualOrderNoAndSysCodeMapRouteId(actualOrderNo, sysCode, null);
+        return getRouteByOrderNoAndSysCode(actualOrderNo, sysCode, false);
-        if (routeId == null) {
-            routeCacheManage.invalidateActualOrderNoAndSysCodeMapRouteId(actualOrderNo, sysCode);
     }
-        RouteOrder routeOrder = jdbcRouteRepository.findByApproveOrderNo_ActualOrderNoAndApproveOrderNo_SysCode(actualOrderNo, sysCode);
+
+    private RouteOrder getRouteByOrderNoAndSysCode(String orderNo, String sysCode, boolean isFake) {
+        Long routeId = isFake ?
+                routeCacheManage.cacheFakeOrderNoAndSysCodeMapRouteId(orderNo, sysCode, null) :
+                routeCacheManage.cacheActualOrderNoAndSysCodeMapRouteId(orderNo, sysCode, null);
+        if (routeId == null) {
+            if (isFake) {
+                routeCacheManage.invalidateFakeOrderNoAndSysCodeMapRouteId(orderNo, sysCode);
+            } else {
+                routeCacheManage.invalidateActualOrderNoAndSysCodeMapRouteId(orderNo, sysCode);
+            }
+        }
+        RouteOrder routeOrder = isFake ?
+                jdbcRouteRepository.findByApproveOrderNo_FakeOrderNoAndApproveOrderNo_SysCode(orderNo, sysCode) :
+                jdbcRouteRepository.findByApproveOrderNo_ActualOrderNoAndApproveOrderNo_SysCode(orderNo, sysCode);
         if (routeOrder == null) {
-            routeCacheManage.invalidateActualOrderNoAndSysCodeMapRouteId(actualOrderNo, sysCode);
+            if (isFake) {
-            return null;
+                routeCacheManage.invalidateFakeOrderNoAndSysCodeMapRouteId(orderNo, sysCode);
+            } else {
+                routeCacheManage.invalidateActualOrderNoAndSysCodeMapRouteId(orderNo, sysCode);
+            }
         } else {
             routeOrder.reloadStatus();
-            routeCacheManage.cacheActualOrderNoAndSysCodeMapRouteId(actualOrderNo, sysCode, routeOrder);
+            if (isFake) {
-            return getFromCacheOrSaveToCache(routeOrder.getRouteId());
+                routeCacheManage.cacheFakeOrderNoAndSysCodeMapRouteId(orderNo, sysCode, routeOrder);
+            } else {
+                routeCacheManage.cacheActualOrderNoAndSysCodeMapRouteId(orderNo, sysCode, routeOrder);
             }
+            updateRouteCache(routeOrder);
         }
+        return routeOrder;
+    }
+
 
     public RouteOrder getRouteByRouteOrderNo(String routeOrderNo) {
         Long routeId = routeCacheManage.cacheRouteOrderNoMapRouteId(routeOrderNo, null);

src/test/java/com/chint/RouteApplicationTests.java

@@ -335,6 +335,8 @@ class RouteApplicationTests {
     }
 
 
+
+
     @Test
     void testPushBatch() throws UnsupportedEncodingException {
         List<String> billcodeList = List.of("CLS24062500065",