装柜回归测试

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", "WAIT_SPLIT",
+    @Schema(allowableValues = {"PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED",
         "LOADING", "LOADED", "DELIVERED"})
     @Size(max = 32) String mainStatus,
     Long customerId,

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

@@ -78,37 +78,6 @@ public class OrderMasterDataGuard {
             throw downstreamFailure(exception);
         }
     }
-    public PartnerClient.Partner validateCarrier(long id) {
-        try {
-            ApiResponse<PartnerClient.Partner> response;
-            try {
-                response = partners.active(token, publicTenantId, id);
-            } catch (FeignException.NotFound exception) {
-                throw new BizException(ResultCode.NOT_FOUND, "承运商不存在或不可用");
-            }
-            requireSuccessful(response, "承运商");
-            if (response.data() == null) throw unavailable("承运商");
-            var value = response.data();
-            if (!Long.valueOf(id).equals(value.id())) throw unavailable("承运商");
-            if (!Long.valueOf(publicTenantId).equals(value.tenantId()))
-                throw new BizException(ResultCode.FORBIDDEN, "承运商不属于平台公共主数据");
-            if (!"ACTIVE".equals(value.status()))
-                throw new BizException(ResultCode.CONFLICT, "承运商已停用");
-            boolean hasCarrierType = value.types() != null && value.types().contains("CARRIER");
-            boolean legacyCarrierType = (value.types() == null || value.types().isEmpty())
-                && "CARRIER".equals(value.partnerType());
-            if (!hasCarrierType && !legacyCarrierType)
-                throw new BizException(ResultCode.VALIDATION_FAILED, "所选往来单位不具备承运商类型");
-            if (!StringUtils.hasText(value.partnerName())) throw unavailable("承运商");
-            return value;
-        } catch (FeignException exception) {
-            throw downstreamFailure(exception);
-        } catch (BizException exception) {
-            throw exception;
-        } catch (RuntimeException exception) {
-            throw downstreamFailure(exception);
-        }
-    }
     private PartnerClient.Partner loadPartner(long id) {
         ApiResponse<PartnerClient.Partner> response;
         try {

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

@@ -31,7 +31,8 @@ import java.util.stream.Collectors;
 @Service
 public class UnifiedOrderQueryService {
     private static final Set<String> MAIN_STATUSES = Set.of(
-        "PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED", "WAIT_SPLIT", "LOADING", "LOADED", "DELIVERED");
+        "PENDING_REVIEW", "WAIT_MEASURE", "INBOUNDED", "LOADING", "LOADED", "DELIVERED");
+    private static final String LEGACY_WAIT_SPLIT = "WAIT_SPLIT";
     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,
@@ -92,7 +93,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(), query.mainStatus(), query.customerId(),
+            tenantId, query.keyword(), query.orderNo(), canonicalMainStatus(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(),
@@ -199,8 +200,7 @@ public class UnifiedOrderQueryService {
         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" -> "INBOUNDED";
-            case "WAIT_SPLIT" -> "WAIT_SPLIT";
+            case "WAIT_PRICING", "FEE_CONFIRMING", "INBOUNDING", "INBOUNDED", LEGACY_WAIT_SPLIT -> "INBOUNDED";
             case "LOADING", "LOADED", "DELIVERED" -> status;
             default -> null;
         };
@@ -211,7 +211,9 @@ public class UnifiedOrderQueryService {
     }
 
     private void validate(UnifiedOrderQuery query) {
-        if (StringUtils.hasText(query.mainStatus()) && !MAIN_STATUSES.contains(query.mainStatus())) {
+        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
@@ -241,6 +243,10 @@ 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

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