优化

firstleg/src/test/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingServiceTest.java

@@ -11,6 +11,7 @@ import com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.Query;
 import com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.PartyRequest;
 import com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.ReleaseRequest;
 import com.baiyue.firstleg.service.LoadingPickService;
+import com.baiyue.firstleg.service.WarehouseSupplierSnapshotService;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingContainerRequirementEntity;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingContainerAllocationEntity;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingEntity;
@@ -42,6 +43,7 @@ class OceanBookingServiceTest {
     @Mock private OceanBookingRepository repository;
     @Mock private PriceBookQueryRepository priceBooks;
     @Mock private LoadingPickService loadingPickService;
+    @Mock private WarehouseSupplierSnapshotService suppliers;
     @InjectMocks private OceanBookingService service;
 
     @BeforeEach
@@ -53,6 +55,7 @@ class OceanBookingServiceTest {
         when(repository.requirements(anyLong())).thenReturn(List.of());
         when(repository.allocations(anyLong())).thenReturn(List.of());
         when(repository.histories(anyLong())).thenReturn(List.of());
+        when(suppliers.booking(any(), any())).thenReturn(null);
         when(repository.claimOperation(any(), anyLong(), anyString(), anyString(), anyString())).thenReturn(true);
         when(repository.completeOperation(anyLong(), anyLong(), anyString(), anyString(), anyString())).thenReturn(1);
         when(repository.transition(anyLong(), eq("DRAFT"), eq("CONFIRMED"), isNull(), eq(0),

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

@@ -0,0 +1,52 @@
+package com.baiyue.firstleg.service;
+
+import com.baiyue.common.core.exception.BizException;
+import com.baiyue.firstleg.client.WarehouseSupplierClient;
+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 static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import com.baiyue.common.core.api.ApiResponse;
+
+class WarehouseSupplierSnapshotServiceTest {
+    @Mock WarehouseSupplierClient client;
+    private WarehouseSupplierSnapshotService service;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+        service = new WarehouseSupplierSnapshotService();
+        ReflectionTestUtils.setField(service, "client", client);
+        ReflectionTestUtils.setField(service, "internalToken", "internal-token");
+    }
+
+    @Test
+    void rejectsFreeTextWithoutSupplierId() {
+        assertThatThrownBy(() -> service.trucking(null, "任意承运商"))
+            .isInstanceOf(BizException.class).hasMessageContaining("自由文本");
+        verifyNoInteractions(client);
+    }
+
+    @Test
+    void resolvesActiveBookingSupplierWithFixedScopeAndServerName() {
+        when(client.get("internal-token", 7L, true, "BOOKING", "INTERNATIONAL"))
+            .thenReturn(ApiResponse.success(new WarehouseSupplierClient.Snapshot(7L, "海运代理", "BOOKING", "INTERNATIONAL", "ACTIVE")));
+        var snapshot = service.booking(7L, "海运代理");
+        assertThat(snapshot.name()).isEqualTo("海运代理");
+        verify(client).get("internal-token", 7L, true, "BOOKING", "INTERNATIONAL");
+    }
+
+    @Test
+    void rejectsClientNameThatDiffersFromWarehouseSnapshot() {
+        when(client.get(anyString(), eq(9L), eq(true), eq("CUSTOMS"), isNull()))
+            .thenReturn(ApiResponse.success(new WarehouseSupplierClient.Snapshot(9L, "真实报关行", "CUSTOMS", null, "ACTIVE")));
+        assertThatThrownBy(() -> service.customs(9L, "伪造名称"))
+            .isInstanceOf(BizException.class).hasMessageContaining("不一致");
+    }
+}