优化

firstleg/src/test/java/com/baiyue/firstleg/client/IamCustomerSnapshotClientContractTest.java

@@ -0,0 +1,26 @@
+package com.baiyue.firstleg.client;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.lang.reflect.Method;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class IamCustomerSnapshotClientContractTest {
+    @Test
+    void usesInternalIamCustomerQueryWithTokenAndExactCustomerFilter() throws Exception {
+        FeignClient annotation = IamCustomerSnapshotClient.class.getAnnotation(FeignClient.class);
+        assertThat(annotation.path()).isEqualTo("/internal/iam");
+        Method method = IamCustomerSnapshotClient.class.getDeclaredMethod("page", String.class,
+            int.class, int.class, String.class, String.class, Long.class);
+        assertThat(method.getAnnotation(GetMapping.class).value()).containsExactly("/finance-customers");
+        assertThat(((RequestHeader) method.getParameterAnnotations()[0][0]).value())
+            .isEqualTo("X-Internal-Service-Token");
+        assertThat(((RequestParam) method.getParameterAnnotations()[4][0]).value()).isEqualTo("status");
+        assertThat(((RequestParam) method.getParameterAnnotations()[5][0]).value()).isEqualTo("customerId");
+    }
+}

firstleg/src/test/java/com/baiyue/firstleg/controller/TruckAppointmentControllerContractTest.java

@@ -19,6 +19,7 @@ class TruckAppointmentControllerContractTest {
  @Test void exposesDedicatedEndpointAndPermissions() {String p=PlatformTruckAppointmentController.class.getAnnotation(org.springframework.web.bind.annotation.RequestMapping.class).value()[0];assertThat(p).isEqualTo("/api/platform/v1/truck-appointments"); for(String n:new String[]{"page","detail","history","attachments","attach","upload","deleteAttachment","create","edit","action","reschedule"}) assertThat(java.util.Arrays.stream(PlatformTruckAppointmentController.class.getDeclaredMethods()).anyMatch(m->m.getName().equals(n))).isTrue();}
  @Test void schemaHasAggregateTablesStatesAndActualEventTimes() throws Exception {String s=new ClassPathResource("db/phase3-truck-appointment-schema.sql").getContentAsString(StandardCharsets.UTF_8);assertThat(s).contains("fl_truck_appointment","fl_truck_appointment_history","fl_truck_appointment_attachment","fl_truck_appointment_operation","PENDING_DISPATCH","PICKUP_IN_PROGRESS","ARRIVED_WAREHOUSE","RESCHEDULED","actual_arrived_warehouse_at","actual_loading_at","actual_departed_at","CALL phase3_truck_add_column");}
  @Test void openApiDocumentsLifecycleIdempotencyAndActualTimes() throws Exception {String s=new ClassPathResource("openapi/truck-appointments-v1.yaml").getContentAsString(StandardCharsets.UTF_8);assertThat(s).contains("/api/platform/v1/truck-appointments/{id}/{action}:","/api/platform/v1/truck-appointments/{id}/reschedule:","name: Idempotency-Key","required: true","actual event timestamps");}
+ @Test void openApiFreezesIndependentCreateAndOptionalAssociations() throws Exception {String s=new ClassPathResource("openapi/truck-appointments-v1.yaml").getContentAsString(StandardCharsets.UTF_8);assertThat(s).contains("required: [customerId, carrierId, plannedLoadingAt, expectedVersion]","independent operational records","no RELEASED-state prerequisite","It may be supplied only with containerBookingId","ACTIVE IAM customer","ACTIVE Warehouse supplier ID validated as TRUCKING","Fulfillment associations remain null");}
  @Test void openApiFreezesAttachmentRequestAndOwnershipContract() throws Exception {String s=new ClassPathResource("openapi/truck-appointments-v1.yaml").getContentAsString(StandardCharsets.UTF_8);assertThat(s).contains("AttachmentRequest:","required: [fileId]","maxLength: 64","TRUCK_APPOINTMENT_ATTACHMENT","Deletes the appointment reference only","DetailStableReferences:","oceanBookingNo:","shippingCompanyName:","bookingAgentName:","cabinetNo:");}
  @Test void methodsHavePlatformPermissionsAndAuthenticatedScope() {
    Map<String,String> expected=Map.ofEntries(

firstleg/src/test/java/com/baiyue/firstleg/repository/TruckAppointmentMapperContractTest.java

@@ -26,6 +26,9 @@ class TruckAppointmentMapperContractTest {
         String reschedule = TruckAppointmentMapper.class.getMethod("reschedule", long.class, java.time.LocalDateTime.class, String.class, int.class).getAnnotation(Update.class).value()[0];
         assertThat(reschedule).contains("status='RESCHEDULED'", "version=#{version}", "revision=revision+1");
         String edit = TruckAppointmentMapper.class.getMethod("updateEdit", TruckAppointmentEntity.class, int.class).getAnnotation(Update.class).value()[0];
-        assertThat(edit).contains("WHERE id=#{e.id} AND version=#{version}", "version=version+1", "revision=revision+1");
+        assertThat(edit).contains("ocean_booking_id=#{e.oceanBookingId}", "container_booking_id=#{e.containerBookingId}",
+            "loading_plan_id=#{e.loadingPlanId}", "customer_id=#{e.customerId}", "carrier_id=#{e.carrierId}",
+            "planned_loading_at=#{e.plannedLoadingAt}", "WHERE id=#{e.id} AND version=#{version}",
+            "version=version+1", "revision=revision+1");
     }
 }

firstleg/src/test/java/com/baiyue/firstleg/service/IamCustomerSnapshotServiceTest.java

@@ -0,0 +1,59 @@
+package com.baiyue.firstleg.service;
+
+import com.baiyue.common.core.api.ApiResponse;
+import com.baiyue.common.core.api.PageResult;
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.firstleg.client.IamCustomerSnapshotClient;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class IamCustomerSnapshotServiceTest {
+    @Mock IamCustomerSnapshotClient client;
+    private IamCustomerSnapshotService service;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+        service = new IamCustomerSnapshotService();
+        ReflectionTestUtils.setField(service, "client", client);
+        ReflectionTestUtils.setField(service, "internalToken", "internal-token");
+    }
+
+    @Test
+    void resolvesExactlyOneActiveCustomerAndUsesServerName() {
+        var customer = new IamCustomerSnapshotClient.Customer(
+            7L, "C-7", "Canonical Customer", "ACTIVE", null, null);
+        when(client.page("internal-token", 1, 2, null, "ACTIVE", 7L))
+            .thenReturn(ApiResponse.success(new PageResult<>(List.of(customer), 1, 2, 1, 1)));
+
+        var result = service.active(7L, "Canonical Customer");
+
+        assertThat(result.tenantName()).isEqualTo("Canonical Customer");
+        verify(client).page("internal-token", 1, 2, null, "ACTIVE", 7L);
+    }
+
+    @Test
+    void rejectsMissingInactiveOrClientSuppliedDifferentName() {
+        when(client.page("internal-token", 1, 2, null, "ACTIVE", 7L))
+            .thenReturn(ApiResponse.success(new PageResult<>(List.of(), 1, 2, 0, 0)));
+        assertThatThrownBy(() -> service.active(7L, null))
+            .isInstanceOf(BizException.class).hasMessageContaining("不存在或未启用");
+
+        var customer = new IamCustomerSnapshotClient.Customer(
+            7L, "C-7", "Canonical Customer", "ACTIVE", null, null);
+        when(client.page("internal-token", 1, 2, null, "ACTIVE", 7L))
+            .thenReturn(ApiResponse.success(new PageResult<>(List.of(customer), 1, 2, 1, 1)));
+        assertThatThrownBy(() -> service.active(7L, "Forged Customer"))
+            .isInstanceOf(BizException.class).hasMessageContaining("不一致");
+    }
+}

firstleg/src/test/java/com/baiyue/firstleg/service/LoadingPickServiceTest.java

@@ -532,29 +532,33 @@ class LoadingPickServiceTest {
     }
 
     @Test
-    void conflictingTruckAppointmentsLeavePdaTaskPlanAndSettlementUntouched() {
+    void conflictingTruckAppointmentsDoNotBlockPdaCompletion() {
         LoadingPickTaskEntity task = task();
+        LoadingPickItemEntity item = item();
         when(repository.taskForUpdate(20L)).thenReturn(task);
+        when(repository.task(20L)).thenReturn(task);
+        when(repository.items(20L)).thenReturn(List.of(item));
         when(repository.allTaskItemsResolved(20L)).thenReturn(true);
+        when(repository.allPlanItemsPicked(10L)).thenReturn(true);
+        when(repository.approve(20L, 9L, "operator", "checked")).thenReturn(1);
         when(repository.review(20L)).thenReturn(null);
         var owner = new LoadingPickItemMapper.InboundOwner(101L, 50L);
         when(repository.inboundOwners(20L)).thenReturn(List.of(owner));
         when(repository.inboundForUpdate(101L, 50L)).thenReturn(
             new LoadingInboundMapper.Snapshot(50L, 101L, "LOADING", 7));
         doThrow(new BizException(com.baiyue.common.core.api.ResultCode.CONFLICT,
-            "同一柜次存在多条有效拖车预约，不能确认装柜完成"))
+            "同一柜次存在多条有效拖车预约，跳过自动完成"))
             .when(truckAppointmentService).completeLoadingFromPda(99L, 20L, 9L, "operator");
 
-        assertThatThrownBy(() -> service.complete(20L,
-            new CompleteLoadingRequest(0, "complete-blocked", "checked"), 9L, "operator"))
-            .isInstanceOf(BizException.class).hasMessageContaining("多条有效拖车预约");
+        service.complete(20L,
+            new CompleteLoadingRequest(0, "complete-not-blocked", "checked"), 9L, "operator");
 
-        verify(settlementService, never()).settle(anyLong(), anyLong(), anyString());
-        verify(repository, never()).approve(anyLong(), anyLong(), anyString(), any());
-        verify(loadingListService, never()).finishFromPda(anyLong(), anyLong(), anyLong(), anyString());
-        verify(loadingDeliveryService, never()).completeAfterPdaSettlement(anyLong(), anyLong(), anyLong(),
-            anyString(), anyString(), any());
-        verify(loadingListService, never()).publishCompletedEvent(anyLong());
+        verify(settlementService).settle(20L, 9L, "operator");
+        verify(repository).approve(20L, 9L, "operator", "checked");
+        verify(loadingListService).finishFromPda(10L, 20L, 9L, "operator");
+        verify(loadingDeliveryService).completeAfterPdaSettlement(101L, 50L, 9L, "operator",
+            "PDA-complete-not-blocked-50", "checked");
+        verify(loadingListService).publishCompletedEvent(10L);
     }
 
     @Test

firstleg/src/test/java/com/baiyue/firstleg/service/TruckAppointmentServiceTest.java

@@ -15,6 +15,8 @@ import com.baiyue.firstleg.repository.ContainerRepository;
 import com.baiyue.firstleg.oceanbooking.repository.OceanBookingRepository;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingEntity;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingContainerAllocationEntity;
+import com.baiyue.firstleg.client.IamCustomerSnapshotClient;
+import com.baiyue.firstleg.client.WarehouseSupplierClient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -40,11 +42,16 @@ class TruckAppointmentServiceTest {
     @Mock SmartLoadingRepository loadingPlans;
     @Mock ContainerRepository containers;
     @Mock WarehouseSupplierSnapshotService suppliers;
+    @Mock IamCustomerSnapshotService customers;
     @Spy ObjectMapper objectMapper = JsonMapper.builder().findAndAddModules().build();
     @InjectMocks TruckAppointmentService service;
 
     @BeforeEach void setUp() { MockitoAnnotations.openMocks(this);
-        when(suppliers.trucking(any(), any())).thenReturn(null);
+        when(customers.active(anyLong(), any())).thenAnswer(invocation ->
+            new IamCustomerSnapshotClient.Customer(invocation.getArgument(0), "C-7",
+                "Canonical Customer", "ACTIVE", null, null));
+        when(suppliers.trucking(any(), any())).thenReturn(
+            new WarehouseSupplierClient.Snapshot(8L, "Canonical Carrier", "TRUCKING", "ACTIVE"));
     }
 
     @Test void detailResolvesStableNamesAndIdentifiersFromLinkedResources() {
@@ -75,49 +82,103 @@ class TruckAppointmentServiceTest {
         verifyNoInteractions(repository);
     }
 
-    @Test void createRejectsBookingThatIsNotReleased() {
+    @Test void createWithoutBookingContainerOrPlanWritesIndependentDraft() {
         SaveRequest request = mock(SaveRequest.class);
         when(request.expectedVersion()).thenReturn(0);
-        when(request.oceanBookingId()).thenReturn(99L);
-        when(request.containerBookingId()).thenReturn(88L);
-        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("CONFIRMED");
-        when(oceanBookings.find(99L)).thenReturn(booking);
-        assertThatThrownBy(() -> service.create(7L, "admin", request)).isInstanceOf(BizException.class).hasMessageContaining("放舱");
-        verify(repository, never()).insert(any());
+        when(request.customerId()).thenReturn(7L);
+        when(request.carrierId()).thenReturn(8L);
+        when(request.plannedLoadingAt()).thenReturn(LocalDateTime.of(2026, 8, 17, 10, 0));
+        when(request.oceanBookingId()).thenReturn(null);
+        when(request.containerBookingId()).thenReturn(null);
+        when(request.loadingPlanId()).thenReturn(null);
+        when(request.warehouseId()).thenReturn(null);
+
+        service.create(7L, "admin", request);
+
+        ArgumentCaptor<TruckAppointmentEntity> entity = ArgumentCaptor.forClass(TruckAppointmentEntity.class);
+        verify(repository).insert(entity.capture());
+        assertThat(entity.getValue().getOceanBookingId()).isNull();
+        assertThat(entity.getValue().getContainerBookingId()).isNull();
+        assertThat(entity.getValue().getLoadingPlanId()).isNull();
+        assertThat(entity.getValue().getCustomerName()).isEqualTo("Canonical Customer");
+        assertThat(entity.getValue().getCarrierName()).isEqualTo("Canonical Carrier");
+        verifyNoInteractions(oceanBookings, containers, loadingPlans);
     }
 
-    @Test void createAcceptsReleasedBookingAndWritesDraft() {
+    @Test void createAcceptsConfirmedBookingWithoutContainerOrPlan() {
         SaveRequest request = mock(SaveRequest.class);
         when(request.expectedVersion()).thenReturn(0);
         when(request.oceanBookingId()).thenReturn(99L);
-        when(request.containerBookingId()).thenReturn(88L);
         when(request.customerId()).thenReturn(7L);
+        when(request.carrierId()).thenReturn(8L);
+        when(request.plannedLoadingAt()).thenReturn(LocalDateTime.of(2026, 8, 17, 10, 0));
+        when(request.containerBookingId()).thenReturn(null);
         when(request.loadingPlanId()).thenReturn(null);
-        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("RELEASED"); booking.setCustomerId(7L); booking.setCustomerName("Canonical Customer");
+        when(request.warehouseId()).thenReturn(null);
+        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("CONFIRMED"); booking.setCustomerId(7L); booking.setWarehouseId(18L);
         when(oceanBookings.find(99L)).thenReturn(booking);
-        ContainerBookingEntity container = new ContainerBookingEntity(); container.setId(88L);
-        when(containers.find(88L)).thenReturn(container);
-        var allocation = new OceanBookingContainerAllocationEntity(); allocation.setContainerBookingId(88L);
-        when(oceanBookings.allocations(99L)).thenReturn(java.util.List.of(allocation));
-        LoadingPlanEntity plan = new LoadingPlanEntity(); plan.setId(77L); plan.setContainerBookingId(88L);
-        when(loadingPlans.planByBooking(88L)).thenReturn(plan);
         service.create(7L, "admin", request);
         ArgumentCaptor<TruckAppointmentEntity> entity = ArgumentCaptor.forClass(TruckAppointmentEntity.class);
         verify(repository).insert(entity.capture());
         assertThat(entity.getValue().getCustomerId()).isEqualTo(7L);
         assertThat(entity.getValue().getCustomerName()).isEqualTo("Canonical Customer");
-        assertThat(entity.getValue().getContainerBookingId()).isEqualTo(88L);
-        assertThat(entity.getValue().getLoadingPlanId()).isEqualTo(77L);
+        assertThat(entity.getValue().getOceanBookingId()).isEqualTo(99L);
+        assertThat(entity.getValue().getContainerBookingId()).isNull();
+        assertThat(entity.getValue().getLoadingPlanId()).isNull();
+        assertThat(entity.getValue().getWarehouseId()).isEqualTo(18L);
         verify(repository).history(any(TruckAppointmentHistoryEntity.class));
     }
 
+    @Test void createRejectsBookingFromAnotherCustomer() {
+        SaveRequest request = validRequest();
+        when(request.oceanBookingId()).thenReturn(99L);
+        OceanBookingEntity booking = new OceanBookingEntity();
+        booking.setId(99L); booking.setCustomerId(17L);
+        when(oceanBookings.find(99L)).thenReturn(booking);
+
+        assertThatThrownBy(() -> service.create(7L, "admin", request))
+            .isInstanceOf(BizException.class).hasMessageContaining("customerId").hasMessageContaining("订舱");
+        verify(repository, never()).insert(any());
+    }
+
+    @Test void createWithBookingAndContainerRequiresTheirAllocation() {
+        SaveRequest request = validRequest();
+        when(request.oceanBookingId()).thenReturn(99L);
+        when(request.containerBookingId()).thenReturn(88L);
+        OceanBookingEntity booking = new OceanBookingEntity();
+        booking.setId(99L); booking.setCustomerId(7L); booking.setWarehouseId(18L);
+        ContainerBookingEntity container = new ContainerBookingEntity();
+        container.setId(88L); container.setCustomerId(7L); container.setWarehouseId(18L);
+        when(oceanBookings.find(99L)).thenReturn(booking);
+        when(containers.find(88L)).thenReturn(container);
+        when(oceanBookings.allocations(99L)).thenReturn(List.of());
+
+        assertThatThrownBy(() -> service.create(7L, "admin", request))
+            .isInstanceOf(BizException.class).hasMessageContaining("未分配至该订舱");
+        verify(repository, never()).insert(any());
+    }
+
+    @Test void createRejectsLoadingPlanWithoutContainerAssociation() {
+        SaveRequest request = validRequest();
+        when(request.loadingPlanId()).thenReturn(77L);
+
+        assertThatThrownBy(() -> service.create(7L, "admin", request))
+            .isInstanceOf(BizException.class).hasMessageContaining("loadingPlanId")
+            .hasMessageContaining("containerBookingId");
+        verify(repository, never()).insert(any());
+    }
+
     @Test void createRejectsLoadingPlanFromAnotherContainer() {
         SaveRequest request = mock(SaveRequest.class);
         when(request.expectedVersion()).thenReturn(0);
         when(request.oceanBookingId()).thenReturn(99L);
         when(request.containerBookingId()).thenReturn(88L);
         when(request.loadingPlanId()).thenReturn(77L);
-        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("RELEASED"); booking.setCustomerId(7L); booking.setCustomerName("Canonical Customer");
+        when(request.customerId()).thenReturn(7L);
+        when(request.carrierId()).thenReturn(8L);
+        when(request.plannedLoadingAt()).thenReturn(LocalDateTime.of(2026, 8, 17, 10, 0));
+        when(request.warehouseId()).thenReturn(null);
+        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("CONFIRMED"); booking.setCustomerId(7L);
         when(oceanBookings.find(99L)).thenReturn(booking);
         ContainerBookingEntity container = new ContainerBookingEntity(); container.setId(88L);
         when(containers.find(88L)).thenReturn(container);
@@ -138,7 +199,11 @@ class TruckAppointmentServiceTest {
         when(request.oceanBookingId()).thenReturn(99L);
         when(request.containerBookingId()).thenReturn(88L);
         when(request.loadingPlanId()).thenReturn(77L);
-        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("RELEASED"); booking.setCustomerId(7L); booking.setCustomerName("Canonical Customer");
+        when(request.customerId()).thenReturn(7L);
+        when(request.carrierId()).thenReturn(8L);
+        when(request.plannedLoadingAt()).thenReturn(LocalDateTime.of(2026, 8, 17, 10, 0));
+        when(request.warehouseId()).thenReturn(null);
+        OceanBookingEntity booking = new OceanBookingEntity(); booking.setId(99L); booking.setStatus("CONFIRMED"); booking.setCustomerId(7L);
         when(oceanBookings.find(99L)).thenReturn(booking);
         ContainerBookingEntity container = new ContainerBookingEntity(); container.setId(88L);
         when(containers.find(88L)).thenReturn(container);
@@ -148,7 +213,7 @@ class TruckAppointmentServiceTest {
         when(loadingPlans.planByBooking(88L)).thenReturn(null);
 
         assertThatThrownBy(() -> service.create(7L, "admin", request))
-            .isInstanceOf(BizException.class).hasMessageContaining("尚未建立装柜计划");
+            .isInstanceOf(BizException.class).hasMessageContaining("loadingPlanId").hasMessageContaining("当前装柜计划");
         verify(repository, never()).insert(any());
     }
 
@@ -292,4 +357,17 @@ class TruckAppointmentServiceTest {
             return (SaveRequest) c.newInstance(args);
         } catch (ReflectiveOperationException ex) { throw new AssertionError(ex); }
     }
+
+    private static SaveRequest validRequest() {
+        SaveRequest request = mock(SaveRequest.class);
+        when(request.expectedVersion()).thenReturn(0);
+        when(request.customerId()).thenReturn(7L);
+        when(request.carrierId()).thenReturn(8L);
+        when(request.plannedLoadingAt()).thenReturn(LocalDateTime.of(2026, 8, 17, 10, 0));
+        when(request.oceanBookingId()).thenReturn(null);
+        when(request.containerBookingId()).thenReturn(null);
+        when(request.loadingPlanId()).thenReturn(null);
+        when(request.warehouseId()).thenReturn(null);
+        return request;
+    }
 }