优化

order/src/main/java/com/baiyue/order/dto/UnifiedOrderQuery.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 public record UnifiedOrderQuery(
     @Size(max = 64) String keyword,
     @Size(max = 64) String orderNo,
-    @Schema(allowableValues = {"PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED",
+    @Schema(allowableValues = {"PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED", "WAIT_SPLIT",
         "LOADING", "LOADED", "DELIVERED"})
     @Size(max = 32) String mainStatus,
     Long customerId,

order/src/main/java/com/baiyue/order/service/UnifiedOrderQueryService.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
 @Service
 public class UnifiedOrderQueryService {
     private static final Set<String> MAIN_STATUSES = Set.of(
-        "PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED", "LOADING", "LOADED", "DELIVERED");
+        "PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED", "WAIT_SPLIT", "LOADING", "LOADED", "DELIVERED");
     private static final Set<String> REVIEW_STATUSES = Set.of("UNRECORDED", "PENDING", "APPROVED", "REJECTED");
     private static final List<OrderStatus> ACTIVE_ORDER_STATUSES = List.copyOf(EnumSet.of(
         OrderStatus.SUBMITTED, OrderStatus.APPROVED, OrderStatus.ACCEPTED,
@@ -199,8 +199,8 @@ public class UnifiedOrderQueryService {
         if (status == null) return null;
         return switch (status) {
             case "WAIT_MEASURE", "MEASURING", "MEASURE_PENDING", "MEASURE_REJECTED" -> "WAIT_MEASURE";
-            // WAIT_SPLIT is retained only to normalize records created before status unification.
-            case "WAIT_PRICING", "FEE_CONFIRMING", "INBOUNDING", "WAIT_SPLIT", "INBOUNDED" -> "INBOUNDED";
+            case "WAIT_PRICING", "FEE_CONFIRMING", "INBOUNDING", "INBOUNDED" -> "INBOUNDED";
+            case "WAIT_SPLIT" -> "WAIT_SPLIT";
             case "LOADING", "LOADED", "DELIVERED" -> status;
             default -> null;
         };

order/src/main/resources/openapi/order-v1.yaml

@@ -311,7 +311,7 @@ components:
       required: false
       schema:
         type: string
-        enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, LOADING, LOADED, DELIVERED]
+        enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, WAIT_SPLIT, LOADING, LOADED, DELIVERED]
     UnifiedInboundCode:
       {name: inboundCode, in: query, required: false, description: 客户提交后生成的入仓码，待审核订单同样可查询, schema: {type: string, maxLength: 40}}
     UnifiedInternalOrderStatus:

order/src/test/java/com/baiyue/order/controller/UnifiedOrderApiContractTest.java

@@ -0,0 +1,65 @@
+package com.baiyue.order.controller;
+
+import com.baiyue.order.client.FirstlegUnifiedOrderClient;
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.yaml.snakeyaml.Yaml;
+
+import java.nio.charset.StandardCharsets;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class UnifiedOrderApiContractTest {
+    @Test
+    void keepsPlatformAndMerchantBoundaries() {
+        assertThat(PlatformUnifiedOrderController.class.getAnnotation(RequestMapping.class).value())
+            .containsExactly("/api/platform/v1/orders");
+        assertThat(MerchantUnifiedOrderController.class.getAnnotation(RequestMapping.class).value())
+            .containsExactly("/api/merchant/v1/orders");
+    }
+
+    @Test
+    void documentsPhaseTwoWaitSplitStatus() throws Exception {
+        String yaml = new ClassPathResource("openapi/order-v1.yaml")
+            .getContentAsString(StandardCharsets.UTF_8);
+        Map<String, Object> document = stringMap(new Yaml().load(yaml));
+        Map<String, Object> paths = stringMap(document.get("paths"));
+        assertThat(paths).containsKeys(
+            "/api/platform/v1/orders", "/api/platform/v1/orders/{orderId}",
+            "/api/merchant/v1/orders", "/api/merchant/v1/orders/{orderId}");
+
+        Map<String, Object> components = stringMap(document.get("components"));
+        Map<String, Object> parameters = stringMap(components.get("parameters"));
+        Map<String, Object> mainStatus = stringMap(parameters.get("UnifiedMainStatus"));
+        Map<String, Object> schema = stringMap(mainStatus.get("schema"));
+        assertThat(stringList(schema.get("enum"))).containsExactly(
+            "PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED", "WAIT_SPLIT",
+            "LOADING", "LOADED", "DELIVERED");
+    }
+
+    @Test
+    void keepsFirstlegUnifiedOrderQueryPath() throws Exception {
+        FeignClient client = FirstlegUnifiedOrderClient.class.getAnnotation(FeignClient.class);
+        assertThat(client.path()).isEqualTo("/internal/firstleg/v1/inbounds/unified-orders");
+
+        Method page = FirstlegUnifiedOrderClient.class.getMethod(
+            "page", String.class, FirstlegUnifiedOrderClient.Query.class);
+        assertThat(page.getAnnotation(PostMapping.class).value()).containsExactly("/query");
+    }
+
+    @SuppressWarnings("unchecked")
+    private static Map<String, Object> stringMap(Object value) {
+        return (Map<String, Object>) value;
+    }
+
+    @SuppressWarnings("unchecked")
+    private static List<String> stringList(Object value) {
+        return (List<String>) value;
+    }
+}

order/src/test/java/com/baiyue/order/service/UnifiedOrderQueryServiceTest.java

@@ -20,6 +20,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.IntStream;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -139,6 +140,51 @@ class UnifiedOrderQueryServiceTest {
         verify(orders, never()).unifiedPage(any(), any(), any());
     }
 
+    @Test
+    void waitSplitFilterForwardsExactStatusAndPreservesSummaryForMerchantScope() {
+        UnifiedOrderQuery query = query("WAIT_SPLIT");
+        var summary = summary("WAIT_SPLIT", null);
+        when(firstleg.page(eq("internal-token"), any()))
+            .thenReturn(ApiResponse.success(new PageResult<>(List.of(summary), 1, 20, 1, 1)));
+        when(orders.findByIds(eq(10001L), eq(List.of(77L)))).thenReturn(List.of(order(OrderStatus.PROCESSING)));
+
+        var result = service.page(10001L, query);
+
+        assertThat(result.records()).singleElement()
+            .extracting(row -> row.mainStatus()).isEqualTo("WAIT_SPLIT");
+        ArgumentCaptor<FirstlegUnifiedOrderClient.Query> captor =
+            ArgumentCaptor.forClass(FirstlegUnifiedOrderClient.Query.class);
+        verify(firstleg).page(eq("internal-token"), captor.capture());
+        assertThat(captor.getValue().tenantId()).isEqualTo(10001L);
+        assertThat(captor.getValue().mainStatus()).isEqualTo("WAIT_SPLIT");
+    }
+
+    @Test
+    void fulfillmentTabsForwardStatusSearchAndPaginationToFirstleg() {
+        List<String> statuses = List.of(
+            "WAIT_MEASURE", "INBOUNDED", "WAIT_SPLIT", "LOADING", "LOADED", "DELIVERED");
+        when(firstleg.page(eq("internal-token"), any()))
+            .thenReturn(ApiResponse.success(new PageResult<>(List.of(), 3, 20, 0, 0)));
+
+        statuses.forEach(status -> service.page(null, new UnifiedOrderQuery(
+            "CC-2026", "FL-77", status, null, null, null, null, null,
+            null, null, null, null, null, null, null, null, null, null,
+            null, null, 3, 20)));
+
+        ArgumentCaptor<FirstlegUnifiedOrderClient.Query> captor =
+            ArgumentCaptor.forClass(FirstlegUnifiedOrderClient.Query.class);
+        verify(firstleg, org.mockito.Mockito.times(statuses.size()))
+            .page(eq("internal-token"), captor.capture());
+        IntStream.range(0, statuses.size()).forEach(index ->
+            assertThat(captor.getAllValues().get(index)).satisfies(request -> {
+                assertThat(request.mainStatus()).isEqualTo(statuses.get(index));
+                assertThat(request.keyword()).isEqualTo("CC-2026");
+                assertThat(request.orderNo()).isEqualTo("FL-77");
+                assertThat(request.page()).isEqualTo(3);
+                assertThat(request.size()).isEqualTo(20);
+            }));
+    }
+
     @Test
     void expandedFulfillmentFiltersAreForwardedBeforeDatabasePaging() {
         UnifiedOrderQuery query = new UnifiedOrderQuery(