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

同步功能添加对已下单的飞机不进行取消同步

This commit is contained in:
lulz1 2024-04-12 09:42:52 +08:00
parent ac4edd598d
commit bf394ab564
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/chint/domain/service/RouteRequestDomainService.java
View File

@ -125,15 +125,18 @@ public class RouteRequestDomainService {
Map<Boolean, List<Leg>> collect = legs
.stream()
.collect(Collectors.partitioningBy(leg -> leg.reloadStatus().getLegStatus().equals(LEG_STATUS_ORDERED)
&& leg.getLegType().equals(LEG_TYPE_AIRPLANE)));
.collect(Collectors.partitioningBy(leg -> {
Integer legStatus = leg.reloadStatus().getLegStatus();
return (legStatus.equals(LEG_STATUS_ORDERED) || legStatus.equals(LEG_STATUS_PAYED) || legStatus.equals(LEG_STATUS_FINISH))
&& leg.getLegType().equals(LEG_TYPE_AIRPLANE);
}));
List<Leg> orderedLegs = collect.get(true);
if (!orderedLegs.isEmpty()) {
it.reloadGenerateRequestLegs(orderedLegs);
syncAdapter.of(it.getSupplier()).syncRouteRequest(it);
it.addEvent(RouteRequestEvent.sync(it.getSupplier()));
List<Leg> notOrderLegs = collect.get(false);
notOrderLegs.forEach(leg->leg.addEvent(legEventFactory.creatLegEvent(LEG_EVENT_APPROVAL)));
notOrderLegs.forEach(leg -> leg.addEvent(legEventFactory.creatLegEvent(LEG_EVENT_APPROVAL)));
} else {
it.addEvent(RouteRequestEvent.cancel(it.getSupplier()));
getLegInfoFromRouteOrder(it, routeOrder);