java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: keep terminal drayage actions executable

Browse Source
This commit is contained in:
ouyangxq
2026-09-08 07:39:17 +08:00
parent 287c0f3ce8
commit 61ffff1be0
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/main/java/com/baiyue/firstleg/terminaldrayage/service/TerminalDrayageService.java
+1 -1
View File
@@ -257,7 +257,7 @@ public class TerminalDrayageService {
if (current != null && current.sequence() >= CarrierScheduleNode.PICKUP_READY.sequence() if (current != null && current.sequence() >= CarrierScheduleNode.PICKUP_READY.sequence()
&& value != null && value.getFleetSupplierId() != null && value.getPickupAppointmentAt() != null && value != null && value.getFleetSupplierId() != null && value.getPickupAppointmentAt() != null
&& actualPickupAt(context, value) == null) result.add("RECORD_PICKUP"); && actualPickupAt(context, value) == null) result.add("RECORD_PICKUP");
if (context.unloadingCompletedAt() != null && actualPickupAt(context, value) != null if (value != null && context.unloadingCompletedAt() != null && actualPickupAt(context, value) != null
&& actualEmptyReturnAt(context, value) == null) result.add("RECORD_EMPTY_RETURN"); && actualEmptyReturnAt(context, value) == null) result.add("RECORD_EMPTY_RETURN");
return List.copyOf(result); return List.copyOf(result);
} }
firstleg/src/test/java/com/baiyue/firstleg/terminaldrayage/service/TerminalDrayageServiceTest.java
+13
View File
@@ -154,6 +154,19 @@ class TerminalDrayageServiceTest {
assertThat(service.detail(11L).emptyReturnWarning().overdueHours()).isZero(); assertThat(service.detail(11L).emptyReturnWarning().overdueHours()).isZero();
} }
@Test
void doesNotOfferEmptyReturnWithoutExecutableDrayageAggregate() {
LocalDateTime unloadedAt = LocalDateTime.of(2026, 9, 3, 0, 0);
Context context = context("PICKED_UP", unloadedAt);
when(mapper.context(11L)).thenReturn(context);
when(mapper.find(11L)).thenReturn(null);
var result = service.detail(11L);
assertThat(result.status()).isEqualTo("UNLOADED");
assertThat(result.allowedActions()).doesNotContain("RECORD_EMPTY_RETURN");
}
@Test @Test
void sameIdempotencyKeyWithDifferentPayloadConflictsWithoutWriting() { void sameIdempotencyKeyWithDifferentPayloadConflictsWithoutWriting() {
Context context = context("ARRIVED_DESTINATION_PORT", null); Context context = context("ARRIVED_DESTINATION_PORT", null);