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> queryRoutOrderField(@RequestBody RoutOrderFieldParam param) {