From 45ada279bbb12b7649b532f8c53b2efb005d39de Mon Sep 17 00:00:00 2001
From: lulz1 <lulz1@chint.com>
Date: Mon, 1 Jul 2024 16:21:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=A2=AB=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E8=A1=8C=E7=A8=8B=E8=A7=84=E5=88=92=E5=8D=95=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=B7=BB=E5=8A=A0=E8=A1=8C=E7=A8=8B=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/chint/application/out/OrderOutController.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/com/chint/application/out/OrderOutController.java b/src/main/java/com/chint/application/out/OrderOutController.java
index 8de60f97..6855982b 100644
--- a/src/main/java/com/chint/application/out/OrderOutController.java
+++ b/src/main/java/com/chint/application/out/OrderOutController.java
@@ -12,6 +12,7 @@ import com.chint.domain.repository.RouteRepository;
 import com.chint.domain.repository.UserRepository;
 import com.chint.domain.service.LegDomainService;
 import com.chint.domain.service.OrderDomainService;
+import com.chint.domain.service.RouteApprovalDomainService;
 import com.chint.domain.value_object.*;
 import com.chint.infrastructure.cache.RouteCacheService;
 import com.chint.infrastructure.util.PageResult;
@@ -54,6 +55,8 @@ public class OrderOutController {
     @Autowired
     private RouteRepository routeRepository;
 
+//    @Autowired
+//    private RouteApprovalDomainService routeApprovalDomainService;
 
     @ApiOperation("根据临时单号和系统编码查询订单")
     @PostMapping("/query/billcode")
@@ -81,7 +84,13 @@ public class OrderOutController {
         if (routeId != null) {
             routeOrder = orderQuery.queryById(routeId).reloadStatus();
         }
+        RouteOrder routeOrderFromDB = routeRepository
+                .findByFakeOrderNoAndSysCode(fakeOrderNo, sysCode);
+        if (routeOrderFromDB != null) {
+            routeOrder = routeOrderFromDB;
+        }
         if (routeOrder != null) {
+//            routeApprovalDomainService.checkApprovalPermissions(routeOrder);
             RouteOrderRes routeOrderRes = orderQuery.queryRouteRes(routeOrder);
             return Result.Success(SUCCESS, routeOrderRes);
         } else {
@@ -145,6 +154,7 @@ public class OrderOutController {
         return Result.Success(SUCCESS, legResList);
 
     }
+
     @ApiOperation("查询单日行程规划单")
     @PostMapping("/query/route/filed")
     public Result<PageResult<RouteOrderFiledVO>> queryRoutOrderField(@RequestBody RoutOrderFieldParam param) {