diff --git a/src/main/java/com/chint/application/in/OrderPublicController.java b/src/main/java/com/chint/application/in/OrderPublicController.java index 9fed960a..ea33e517 100644 --- a/src/main/java/com/chint/application/in/OrderPublicController.java +++ b/src/main/java/com/chint/application/in/OrderPublicController.java @@ -81,7 +81,7 @@ public class OrderPublicController { @ApiOperation("根据行程节点号删除") @PostMapping("/leg/delete/legNo") public Result deleteLeg(@RequestBody DeleteLegData deleteLegData) { - legDomainService.deleteByLegNo(deleteLegData.getLegNo()); + orderApplicationService.deleteByLegNo(deleteLegData); return Result.Success(SUCCESS); } diff --git a/src/main/java/com/chint/application/services/OrderApplicationService.java b/src/main/java/com/chint/application/services/OrderApplicationService.java index 0b97aa55..c474fb64 100644 --- a/src/main/java/com/chint/application/services/OrderApplicationService.java +++ b/src/main/java/com/chint/application/services/OrderApplicationService.java @@ -200,6 +200,19 @@ public class OrderApplicationService { }; } + public void deleteByLegNo(DeleteLegData deleteLegData) { + String legNo = deleteLegData.getLegNo(); + RouteOrder routeOrder = null; + if (legNo.contains("&")) { + String[] split = legNo.split("&"); + routeOrder = routeRepository.findTempRouteOrderBySysCodeAndBillCode(split[1], split[2]); + } + if (routeOrder != null && routeOrder.getOrderStatus().equals(ORDER_STATUS_PREPARE)){ + routeOrder.deleteLeg(legNo); + routeRepository.saveTempRouteOrder(routeOrder, 24L); + } + } + public RouteOrder deleteLegToOrder(DeleteLegData deleteLegData) { String legNo = deleteLegData.getLegNo(); @@ -214,6 +227,7 @@ public class OrderApplicationService { } if (routeOrder != null) { routeOrder.reloadStatus(); + routeOrder.deleteLeg(legNo); if (!routeOrder.getApprovalStatusCode().equals(APPROVAL_EVENT_PREPARE)) { return routeRepository.saveTempRouteOrder(routeOrder, 24L); } else {