Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql

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

@@ -31,8 +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");
-    private static final String LEGACY_WAIT_SPLIT = "WAIT_SPLIT";
+        "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,
@@ -95,7 +94,7 @@ public class UnifiedOrderQueryService {
             return new PageResult<>(List.of(), query.page(), query.size(), 0, 0);
         }
         FirstlegUnifiedOrderClient.Query request = new FirstlegUnifiedOrderClient.Query(
-            tenantId, query.keyword(), query.orderNo(), canonicalMainStatus(query.mainStatus()), query.customerId(),
+            tenantId, query.keyword(), query.orderNo(), query.mainStatus(), query.customerId(),
             query.receivingWarehouseId(), query.destinationWarehouseId(), query.inboundCode(),
             query.internalOrderStatus(), query.expectedArrivalDate(), query.feeReviewStatus(), query.channelName(),
             query.containerNo(), query.cabinetNo(), query.sailingDate(), query.loaded(), query.fullContainer(),
@@ -229,9 +228,9 @@ public class UnifiedOrderQueryService {
     private String inboundMainStatus(String status) {
         if (status == null) return null;
         return switch (status) {
-            case "WAIT_MEASURE", "MEASURING", "MEASURE_PENDING", "MEASURE_REJECTED" -> "WAIT_MEASURE";
-            case "WAIT_PRICING", "FEE_CONFIRMING", "INBOUNDING", "INBOUNDED", LEGACY_WAIT_SPLIT -> "INBOUNDED";
-            case "LOADING", "LOADED", "DELIVERED" -> status;
+            case "WAIT_MEASURE", "MEASURING", "MEASURE_PENDING", "MEASURE_REJECTED",
+                 "WAIT_PRICING", "FEE_CONFIRMING", "INBOUNDING" -> "WAIT_MEASURE";
+            case "INBOUNDED", "WAIT_SPLIT", "LOADING", "LOADED", "DELIVERED" -> status;
             default -> null;
         };
     }
@@ -243,7 +242,7 @@ public class UnifiedOrderQueryService {
     private void validate(UnifiedOrderQuery query) {
         if (StringUtils.hasText(query.mainStatus())
             && !MAIN_STATUSES.contains(query.mainStatus())
-            && !LEGACY_WAIT_SPLIT.equals(query.mainStatus())) {
+            ) {
             throw new BizException(ResultCode.BAD_REQUEST, "统一订单主状态不合法");
         }
         if (query.createdFrom() != null && query.createdTo() != null
@@ -273,10 +272,6 @@ public class UnifiedOrderQueryService {
             || StringUtils.hasText(query.measurementReviewStatus());
     }
 
-    private static String canonicalMainStatus(String status) {
-        return LEGACY_WAIT_SPLIT.equals(status) ? "INBOUNDED" : status;
-    }
-
     private <T> ApiResponse<T> call(java.util.concurrent.Callable<ApiResponse<T>> invocation) {
         try { return invocation.call(); }
         catch (FeignException exception) { throw new BizException(ResultCode.SERVICE_UNAVAILABLE, "头程服务暂时不可用"); }

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

@@ -335,9 +335,9 @@ components:
   schemas:
     UnifiedMainStatus:
       type: string
-      enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, LOADING, LOADED, DELIVERED]
+      enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, WAIT_SPLIT, LOADING, LOADED, DELIVERED]
       description: >-
-        统一订单产品主状态。历史内部状态 WAIT_SPLIT 仅作为查询入参兼容，所有列表、详情和时间线响应均归并为 INBOUNDED。
+        统一订单七态产品主状态。WAIT_SPLIT 为正式待分柜状态，INBOUNDED 仅兼容存量已入库记录。
     UnifiedOrderPageEnvelope:
       type: object
       properties:
@@ -669,7 +669,7 @@ components:
       name: mainStatus
       in: query
       required: false
-      description: 历史值 WAIT_SPLIT 仍可作为兼容筛选传入，但响应 mainStatus 始终归并为 INBOUNDED
+      description: 统一订单七态主状态筛选；WAIT_SPLIT 与存量兼容状态 INBOUNDED 独立查询
       schema:
         type: string
         enum: [PENDING_REVIEW, WAIT_MEASURE, INBOUNDED, LOADING, LOADED, DELIVERED, WAIT_SPLIT]

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

@@ -25,7 +25,7 @@ class UnifiedOrderApiContractTest {
     }
 
     @Test
-    void documentsInboundedAsThePhaseTwoTerminalStatus() throws Exception {
+    void documentsSevenProductMainStatuses() throws Exception {
         String yaml = new ClassPathResource("openapi/order-v1.yaml")
             .getContentAsString(StandardCharsets.UTF_8);
         Map<String, Object> document = stringMap(new Yaml().load(yaml));
@@ -46,7 +46,7 @@ class UnifiedOrderApiContractTest {
         Map<String, Object> schemas = stringMap(components.get("schemas"));
         Map<String, Object> responseStatus = stringMap(schemas.get("UnifiedMainStatus"));
         assertThat(stringList(responseStatus.get("enum"))).containsExactly(
-            "PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED", "LOADING", "LOADED", "DELIVERED");
+            "PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED", "WAIT_SPLIT", "LOADING", "LOADED", "DELIVERED");
         assertThat(responseStatus.get("description").toString()).contains("WAIT_SPLIT", "INBOUNDED");
 
         Map<String, Object> row = stringMap(schemas.get("UnifiedOrderRow"));