echo
/
route
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修复被驳回行程规划单无法添加行程的问题

This commit is contained in:
lulz1 2024-07-01 16:21:12 +08:00
parent c59c3be345
commit 45ada279bb
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/chint/application/out/OrderOutController.java
View File

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