From dd98051febbcc48be09544c188e891539b072acd Mon Sep 17 00:00:00 2001
From: lulz1 <lulz1@chint.com>
Date: Tue, 25 Jun 2024 09:35:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/in/OrderPublicController.java      |  2 +-
 .../services/OrderApplicationService.java          | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

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<String> 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 {