Merge branch 'test' into test-02huogui

# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
#	firstleg/src/main/java/com/baiyue/firstleg/BaiyueFirstlegApplication.java
#	firstleg/src/main/resources/openapi/firstleg-v1.yaml

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

@@ -32,43 +32,42 @@ paths:
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/fba-pricing/carrier-rates:
     get:
-      summary: 查询船司 FBA 价格版本
+      summary: 查询平台公共船司 FBA 价格版本
       description: 需要 firstleg:fba-pricing:rate:view 权限
       parameters:
-        - {$ref: '#/components/parameters/OptionalTenantId'}
         - {name: rateCode, in: query, schema: {type: string, maxLength: 50}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/fba-pricing/carrier-rates/versions:
     post:
-      summary: 新建船司 FBA 价格版本
-      parameters: [{$ref: '#/components/parameters/TenantId'}]
+      summary: 新建平台公共船司 FBA 价格版本
       requestBody: {required: true, content: {application/json: {schema: {$ref: '#/components/schemas/CarrierRateVersionRequest'}}}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/fba-pricing/carrier-rates/{id}:
     get:
       summary: 查询船司 FBA 价格版本详情
-      parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/Id'}]
+      parameters: [{$ref: '#/components/parameters/Id'}]
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
     delete:
       summary: 停用船司 FBA 价格版本
-      parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/Id'}]
+      parameters: [{$ref: '#/components/parameters/Id'}]
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/calculate:
     post:
       summary: 按审核通过测量快照试算 FBA 费用
-      description: 精确匹配唯一客户规则和唯一船司价格；需要 firstleg:fba-pricing:calculate 权限。
+      description: 精确匹配唯一客户规则和唯一船司价格；测量审核后即使主流程已到 WAIT_SPLIT，也可独立试算且不回退主流程状态；需要 firstleg:fba-pricing:calculate 权限。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       requestBody: {content: {application/json: {schema: {$ref: '#/components/schemas/CalculateRequest'}}}}
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/confirm:
     post:
       summary: 确认最新费用快照
+      description: 确认费用只更新费用状态；主流程已到 WAIT_SPLIT 时保持不变。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/send:
     post:
-      summary: 手工恢复发送费用快照
-      description: 仅作为异常恢复接口；正常业务由客服测量审核通过后自动计费、发布并完成入库。
+      summary: 发送已确认费用快照
+      description: 该动作涉及后续仓储流程，本轮二期验收不调用。
       parameters: [{$ref: '#/components/parameters/TenantId'}, {$ref: '#/components/parameters/InboundId'}, {$ref: '#/components/parameters/IdempotencyKey'}]
       responses: {'200': {description: 成功或业务失败}, '403': {description: 无权限}}
   /api/platform/v1/inbounds/{inboundId}/fees/latest:

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

@@ -6,6 +6,19 @@ info:
 security:
   - bearerAuth: []
 paths:
+  /internal/firstleg/v1/inbounds/order-approved:
+    post:
+      summary: 订单审核通过后幂等创建入库单
+      description: 仅供订单服务调用；入仓码由订单提交时生成，Firstleg 必须原样沿用。承运商可在后续履约或计费前补充。
+      security:
+        - internalServiceToken: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: {$ref: '#/components/schemas/OrderApprovedInboundCommand'}
+      responses:
+        '200': {description: 成功或业务失败；相同客户和订单重放返回已有入库单 ID}
   /api/platform/v1/first-leg/tasks:
     get:
       summary: 分页查询履约任务
@@ -308,6 +321,10 @@ components:
       in: header
       name: X-Signature
       description: HMAC-SHA256 小写十六进制签名
+    internalServiceToken:
+      type: apiKey
+      in: header
+      name: X-Internal-Service-Token
   parameters:
     XTimestamp:
       name: X-Timestamp
@@ -348,6 +365,36 @@ components:
       required: true
       schema: {type: string, pattern: '^[1-9][0-9]*$'}
   schemas:
+    OrderApprovedInboundCommand:
+      type: object
+      required: [tenantId, orderId, inboundCode, customerName, warehouseId]
+      properties:
+        tenantId: {type: string, pattern: '^[1-9][0-9]*$', description: 当前客户隔离 ID}
+        orderId: {type: string, pattern: '^[1-9][0-9]*$'}
+        orderNo: {type: string, nullable: true}
+        inboundCode: {type: string, minLength: 1, maxLength: 40, example: RK-2085308606829346818}
+        customerId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        customerName: {type: string, minLength: 1}
+        warehouseId: {type: string, pattern: '^[1-9][0-9]*$'}
+        warehouseName: {type: string, nullable: true}
+        deliveryWarehouseId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        deliveryWarehouseName: {type: string, nullable: true}
+        expectedArrivalAt: {type: string, format: date-time, nullable: true}
+        businessType: {type: string, nullable: true}
+        channelCode: {type: string, nullable: true}
+        channelName: {type: string, nullable: true}
+        carrierId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true, description: 可选，可在后续履约或计费前补充}
+        carrierName: {type: string, nullable: true}
+        taxMode: {type: string, nullable: true}
+        containerMode: {type: string, nullable: true}
+        customsInspection: {type: boolean, nullable: true}
+        destinationType: {type: string, nullable: true}
+        destinationWarehouseId: {type: string, pattern: '^[1-9][0-9]*$', nullable: true}
+        destinationCode: {type: string, nullable: true}
+        destinationName: {type: string, nullable: true}
+        publicRemark: {type: string, nullable: true}
+        expressCompanyName: {type: string, nullable: true}
+        expressTrackingNo: {type: string, nullable: true}
     ContainerBookingPageEnvelope:
       type: object
       properties: