优化

firstleg/src/main/resources/openapi/fba-pricing-v1.yaml

@@ -10,7 +10,9 @@ paths:
     get:
       summary: 查询客户计费规则版本
       description: 需要 firstleg:fba-pricing:rule:view 权限
-      parameters: [{$ref: '#/components/parameters/TenantId'}]
+      parameters:
+        - {$ref: '#/components/parameters/OptionalTenantId'}
+        - {name: ruleCode, in: query, schema: {type: string, maxLength: 50}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/fba-pricing/customer-rules/versions:
     post:
@@ -87,9 +89,10 @@ components:
   securitySchemes:
     bearerAuth: {type: http, scheme: bearer, bearerFormat: JWT}
   parameters:
-    TenantId: {name: tenantId, in: query, required: true, schema: {type: integer, format: int64, minimum: 1}}
-    Id: {name: id, in: path, required: true, schema: {type: integer, format: int64}}
-    InboundId: {name: inboundId, in: path, required: true, schema: {type: integer, format: int64}}
+    OptionalTenantId: {name: tenantId, in: query, required: false, description: 不传时查询全部企业, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+    TenantId: {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+    Id: {name: id, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+    InboundId: {name: inboundId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
     IdempotencyKey: {name: Idempotency-Key, in: header, required: true, schema: {type: string, maxLength: 128}}
   schemas:
     AdjustFeeRequest:
@@ -107,7 +110,7 @@ components:
       required: [ruleCode, customerId, customerName, businessType, chargeMode, taxMode, conversionFactor, roundingScale, roundingMode, currency, effectiveFrom]
       properties:
         ruleCode: {type: string, maxLength: 50}
-        customerId: {type: integer, format: int64}
+        customerId: {type: string, pattern: '^[1-9][0-9]*$'}
         customerName: {type: string, maxLength: 128}
         businessType: {type: string, maxLength: 32}
         chargeMode: {type: string, enum: [KG, CBM]}
@@ -123,11 +126,11 @@ components:
       required: [rateCode, originWarehouseId, originWarehouseName, businessType, channelCode, carrierId, carrierName, destinationCode, chargeUnit, unitPrice, currency, additionalFee, effectiveFrom]
       properties:
         rateCode: {type: string, maxLength: 50}
-        originWarehouseId: {type: integer, format: int64}
+        originWarehouseId: {type: string, pattern: '^[1-9][0-9]*$'}
         originWarehouseName: {type: string}
         businessType: {type: string}
         channelCode: {type: string}
-        carrierId: {type: integer, format: int64}
+        carrierId: {type: string, pattern: '^[1-9][0-9]*$'}
         carrierName: {type: string}
         destinationCode: {type: string}
         chargeUnit: {type: string, enum: [KG, CBM]}

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

@@ -127,12 +127,16 @@ paths:
   /api/platform/inbounds:
     get:
       summary: 分页查询入库单
-      description: 需要 platform:firstleg:inbound:list 权限；仅使用 V2 四个页签
+      description: 需要 platform:firstleg:inbound:list 权限；默认查询全部企业，可选 tenantId 筛选；仅使用 V2 四个页签
       parameters:
-        - {name: tenantId, in: query, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+        - {name: tenantId, in: query, required: false, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
         - {name: tab, in: query, schema: {type: string, enum: [WAIT_MEASURE, WAIT_REVIEW, WAIT_FEE_SEND, INBOUNDED]}}
       responses:
-        '200': {description: 成功或业务失败，按响应体 code 判断}
+        '200':
+          description: 成功或业务失败，按响应体 code 判断；每条记录携带后续租户隔离操作所需的 tenantId
+          content:
+            application/json:
+              schema: {$ref: '#/components/schemas/InboundOrderPageEnvelope'}
         '403': {description: 无查询权限}
   /api/platform/inbounds/{inboundId}:
     get:
@@ -251,6 +255,34 @@ components:
       in: query
       schema: {type: integer, format: int64, minimum: 1, maximum: 200, default: 20}
   schemas:
+    InboundOrderPageEnvelope:
+      type: object
+      properties:
+        code: {type: string, example: '200'}
+        message: {type: string}
+        data: {$ref: '#/components/schemas/InboundOrderPage'}
+    InboundOrderPage:
+      type: object
+      properties:
+        records:
+          type: array
+          items: {$ref: '#/components/schemas/InboundOrderSummary'}
+        page: {type: integer, minimum: 1}
+        size: {type: integer, minimum: 1}
+        total: {type: integer, format: int64, minimum: 0}
+        pages: {type: integer, format: int64, minimum: 0}
+    InboundOrderSummary:
+      type: object
+      required: [id, tenantId]
+      properties:
+        id: {type: string, pattern: '^[1-9][0-9]*$'}
+        tenantId: {type: string, pattern: '^[1-9][0-9]*$', description: 记录所属企业租户 ID，用于详情和处理接口的租户隔离}
+        orderId: {type: string, nullable: true}
+        orderNo: {type: string, nullable: true}
+        inboundCode: {type: string, nullable: true}
+        processStatus: {type: string}
+        customerId: {type: string, nullable: true}
+        companyId: {type: string, nullable: true}
     InboundMeasurementCallbackRequest:
       type: object
       required: [eventNo, externalDetailNo, warehouseCode, inboundCode, inboundDetailId, deviceCode, measuredAt, boxSpecification, packageCount, lengthCm, widthCm, heightCm]