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

修复行程规划单，无法匹配机场订单的问题

This commit is contained in:
lulz1 2024-03-24 18:13:13 +08:00
parent 9629a8ffea
commit 4dd6b38fe5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chint/domain/aggregates/order/RouteOrder.java
View File

@ -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; return false;
} }
@ -423,10 +423,12 @@ public class RouteOrder implements Serializable {
Long orderDetailDestinationId = orderDetail.getDestinationId(); Long orderDetailDestinationId = orderDetail.getDestinationId();
return leg.getLegType().equals(orderDetail.getProductType()) && return leg.getLegType().equals(orderDetail.getProductType()) &&
(originLocation.getLocationId().equals(orderDetailOriginId) || (originLocation.getLocationId().equals(orderDetailOriginId) ||
originLocation.getParentLocationId().equals(orderDetailOriginId)) originLocation.getParentLocationId().equals(orderDetailOriginId) ||
originLocation.getLocationPath().contains(String.valueOf(orderDetailOriginId)))
&& &&
(destinationLocation.getLocationId().equals(orderDetailDestinationId) || (destinationLocation.getLocationId().equals(orderDetailDestinationId) ||
destinationLocation.getParentLocationId().equals(orderDetailDestinationId)); destinationLocation.getParentLocationId().equals(orderDetailDestinationId) ||
destinationLocation.getLocationPath().contains(String.valueOf(orderDetailDestinationId)));
}) })
.toList(); .toList();