From 4dd6b38fe5761368b58a8201ca2e5c6d19c082f5 Mon Sep 17 00:00:00 2001
From: lulz1 <lulz1@chint.com>
Date: Sun, 24 Mar 2024 18:13:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=8C=E7=A8=8B=E8=A7=84?=
 =?UTF-8?q?=E5=88=92=E5=8D=95=EF=BC=8C=E6=97=A0=E6=B3=95=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E6=9C=BA=E5=9C=BA=E8=AE=A2=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/chint/domain/aggregates/order/RouteOrder.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chint/domain/aggregates/order/RouteOrder.java b/src/main/java/com/chint/domain/aggregates/order/RouteOrder.java
index 0b5eba35..83abd914 100644
--- a/src/main/java/com/chint/domain/aggregates/order/RouteOrder.java
+++ b/src/main/java/com/chint/domain/aggregates/order/RouteOrder.java
@@ -413,7 +413,7 @@ public class RouteOrder implements Serializable {
                         }
                     }
 
-                    if(leg.getLegType().equals(LEG_TYPE_TAXI)){
+                    if (leg.getLegType().equals(LEG_TYPE_TAXI)) {
                         return false;
                     }
 
@@ -423,10 +423,12 @@ public class RouteOrder implements Serializable {
                     Long orderDetailDestinationId = orderDetail.getDestinationId();
                     return leg.getLegType().equals(orderDetail.getProductType()) &&
                             (originLocation.getLocationId().equals(orderDetailOriginId) ||
-                                    originLocation.getParentLocationId().equals(orderDetailOriginId))
+                                    originLocation.getParentLocationId().equals(orderDetailOriginId) ||
+                                    originLocation.getLocationPath().contains(String.valueOf(orderDetailOriginId)))
                             &&
                             (destinationLocation.getLocationId().equals(orderDetailDestinationId) ||
-                            destinationLocation.getParentLocationId().equals(orderDetailDestinationId));
+                                    destinationLocation.getParentLocationId().equals(orderDetailDestinationId) ||
+                                    destinationLocation.getLocationPath().contains(String.valueOf(orderDetailDestinationId)));
                 })
                 .toList();