优化

firstleg/src/main/resources/db/phase2-fba-pricing-migration.sql

@@ -41,17 +41,18 @@ CALL phase2_fba_add_column('fl_inbound_fee', 'rate_effective_from', "DATETIME(3)
 CALL phase2_fba_add_column('fl_inbound_fee', 'rate_effective_to', "DATETIME(3) NULL COMMENT '价格生效结束快照' AFTER rate_effective_from");
 CALL phase2_fba_add_column('fl_inbound_idempotency', 'result_resource_id', "BIGINT UNSIGNED NULL COMMENT '成功结果资源ID' AFTER result_json");
 CALL phase2_fba_add_column('fl_inbound_pallet_allocation', 'warehouse_resource_tenant_id',
-  "BIGINT UNSIGNED NULL COMMENT '仓储资源所属租户ID' AFTER warehouse_id");
+  "BIGINT UNSIGNED NULL COMMENT '平台公共仓储资源固定使用 0；tenant_id 仍是客户隔离键' AFTER warehouse_id");
 
--- 旧分配记录创建于共享仓储资源租户拆分前，按原业务租户回填后再收口非空约束。
+-- 仓储资源是平台公共主数据；存量分配快照统一迁移到平台作用域 0，再收口非空约束。
 UPDATE fl_inbound_pallet_allocation
-SET warehouse_resource_tenant_id = tenant_id
-WHERE warehouse_resource_tenant_id IS NULL OR warehouse_resource_tenant_id = 0;
-SET @resource_tenant_nullable = (SELECT IS_NULLABLE FROM information_schema.COLUMNS
+SET warehouse_resource_tenant_id = 0
+WHERE warehouse_resource_tenant_id IS NULL OR warehouse_resource_tenant_id <> 0;
+SET @resource_tenant_needs_modify = (SELECT COUNT(*) FROM information_schema.COLUMNS
   WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'fl_inbound_pallet_allocation'
-    AND COLUMN_NAME = 'warehouse_resource_tenant_id');
-SET @sql = IF(@resource_tenant_nullable = 'YES',
-  "ALTER TABLE fl_inbound_pallet_allocation MODIFY COLUMN warehouse_resource_tenant_id BIGINT UNSIGNED NOT NULL COMMENT '仓储资源所属租户ID'",
+    AND COLUMN_NAME = 'warehouse_resource_tenant_id'
+    AND (IS_NULLABLE = 'YES' OR COLUMN_COMMENT <> '平台公共仓储资源固定使用 0；tenant_id 仍是客户隔离键'));
+SET @sql = IF(@resource_tenant_needs_modify > 0,
+  "ALTER TABLE fl_inbound_pallet_allocation MODIFY COLUMN warehouse_resource_tenant_id BIGINT UNSIGNED NOT NULL COMMENT '平台公共仓储资源固定使用 0；tenant_id 仍是客户隔离键'",
   'SELECT 1');
 PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 

firstleg/src/main/resources/db/phase2-fee-item-and-inbound-detail.sql

@@ -3,7 +3,7 @@ SET NAMES utf8mb4;
 
 CREATE TABLE IF NOT EXISTS fl_fee_item (
   id BIGINT UNSIGNED NOT NULL COMMENT '费用项目ID',
-  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '账号ID，沿用tenant_id字段名',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '当前客户ID（客户隔离键）；物理字段名沿用 tenant_id，当前不表示上级租户',
   category VARCHAR(64) NOT NULL COMMENT '费用分类',
   trade_scope VARCHAR(20) NOT NULL COMMENT 'DOMESTIC国内、INTERNATIONAL国际',
   fee_type_name VARCHAR(128) NOT NULL COMMENT '费用类型名称',
@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS fl_fee_item (
 
 CREATE TABLE IF NOT EXISTS fl_inbound_fee_detail (
   id BIGINT UNSIGNED NOT NULL COMMENT '入库费用明细ID',
-  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '账号ID，沿用tenant_id字段名',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '当前客户ID（客户隔离键）；物理字段名沿用 tenant_id，当前不表示上级租户',
   inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
   fee_item_id BIGINT UNSIGNED NOT NULL COMMENT '绑定费用项目ID',
   inbound_code VARCHAR(40) NOT NULL COMMENT '入仓码快照',
@@ -70,3 +70,23 @@ CREATE TABLE IF NOT EXISTS fl_inbound_fee_detail (
   CONSTRAINT fk_inbound_fee_detail_order FOREIGN KEY (inbound_id) REFERENCES fl_inbound_order (id),
   CONSTRAINT fk_inbound_fee_detail_item FOREIGN KEY (fee_item_id) REFERENCES fl_fee_item (id)
 ) ENGINE=InnoDB COMMENT='入库单应收应付费用明细';
+
+-- 既有表同步字段注释：tenant_id 当前承载客户 ID，不是上级租户 ID。
+SET @fee_tenant_comment = '当前客户ID（客户隔离键）；物理字段名沿用 tenant_id，当前不表示上级租户';
+SET @ddl = IF(
+  (SELECT COUNT(*) FROM information_schema.columns
+    WHERE table_schema = DATABASE() AND table_name = 'fl_fee_item'
+      AND column_name = 'tenant_id' AND column_comment = @fee_tenant_comment) = 1,
+  'SELECT 1',
+  'ALTER TABLE fl_fee_item MODIFY COLUMN tenant_id BIGINT UNSIGNED NOT NULL COMMENT ''当前客户ID（客户隔离键）；物理字段名沿用 tenant_id，当前不表示上级租户'''
+);
+PREPARE statement FROM @ddl; EXECUTE statement; DEALLOCATE PREPARE statement;
+
+SET @ddl = IF(
+  (SELECT COUNT(*) FROM information_schema.columns
+    WHERE table_schema = DATABASE() AND table_name = 'fl_inbound_fee_detail'
+      AND column_name = 'tenant_id' AND column_comment = @fee_tenant_comment) = 1,
+  'SELECT 1',
+  'ALTER TABLE fl_inbound_fee_detail MODIFY COLUMN tenant_id BIGINT UNSIGNED NOT NULL COMMENT ''当前客户ID（客户隔离键）；物理字段名沿用 tenant_id，当前不表示上级租户'''
+);
+PREPARE statement FROM @ddl; EXECUTE statement; DEALLOCATE PREPARE statement;

firstleg/src/main/resources/db/phase2-inbound-schema.sql

@@ -423,7 +423,7 @@ CREATE TABLE IF NOT EXISTS fl_inbound_pallet_allocation (
   inbound_id BIGINT UNSIGNED NOT NULL COMMENT '入库单ID',
   allocation_no INT UNSIGNED NOT NULL COMMENT '入库单内分配序号',
   warehouse_id BIGINT UNSIGNED NOT NULL COMMENT '仓库服务仓库ID',
-  warehouse_resource_tenant_id BIGINT UNSIGNED NOT NULL COMMENT '仓储资源所属租户ID',
+  warehouse_resource_tenant_id BIGINT UNSIGNED NOT NULL COMMENT '平台公共仓储资源固定使用 0；tenant_id 仍是客户隔离键',
   pallet_id BIGINT UNSIGNED NOT NULL COMMENT '仓库服务托盘ID',
   pallet_code VARCHAR(50) NOT NULL COMMENT '托盘编码快照',
   pallet_capacity_cbm DECIMAL(18,4) NOT NULL COMMENT '托盘可用容积快照',

firstleg/src/main/resources/db/phase2-measurement-openapi.sql

@@ -4,7 +4,7 @@ USE baiyue_firstleg;
 -- 既有二期数据库增量：先确保 phase2-inbound-schema.sql 中的测量和幂等表已存在。
 CREATE TABLE IF NOT EXISTS fl_third_party_call_log (
   id BIGINT UNSIGNED NOT NULL COMMENT '第三方调用日志ID（雪花ID）',
-  tenant_id BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '识别出的租户ID，未知应用为0',
+  tenant_id BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '第三方未知/未解析主体哨兵值；不是平台客户记录或平台作用域，不得用于业务数据授权',
   app_key VARCHAR(128) NULL COMMENT '第三方应用标识',
   signature_subject VARCHAR(128) NULL COMMENT '签名主体快照',
   request_method VARCHAR(8) NOT NULL COMMENT 'HTTP方法',
@@ -28,3 +28,14 @@ CREATE TABLE IF NOT EXISTS fl_third_party_call_log (
   KEY idx_third_call_nonce (tenant_id, app_key, nonce),
   UNIQUE KEY uk_third_call_idempotency_owner (tenant_id, app_key, idempotency_key, idempotency_anchor)
 ) ENGINE=InnoDB COMMENT='第三方测量开放接口原始请求、签名主体和处理结果留档';
+
+-- 既有表也要同步未知主体 0 的语义，避免历史注释继续误导为真实租户。
+SET @third_party_tenant_comment = '第三方未知/未解析主体哨兵值；不是平台客户记录或平台作用域，不得用于业务数据授权';
+SET @ddl = IF(
+  (SELECT COUNT(*) FROM information_schema.columns
+    WHERE table_schema = DATABASE() AND table_name = 'fl_third_party_call_log'
+      AND column_name = 'tenant_id' AND column_comment = @third_party_tenant_comment) = 1,
+  'SELECT 1',
+  'ALTER TABLE fl_third_party_call_log MODIFY COLUMN tenant_id BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT ''第三方未知/未解析主体哨兵值；不是平台客户记录或平台作用域，不得用于业务数据授权'''
+);
+PREPARE statement FROM @ddl; EXECUTE statement; DEALLOCATE PREPARE statement;

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

@@ -91,8 +91,8 @@ components:
   securitySchemes:
     bearerAuth: {type: http, scheme: bearer, bearerFormat: JWT}
   parameters:
-    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]*$'}}
+    OptionalTenantId: {name: tenantId, in: query, required: false, description: 可选目标客户 ID；参数名为历史兼容，不传时查询全部企业, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
+    TenantId: {name: tenantId, in: query, required: true, description: 目标客户 ID；参数名为历史兼容, 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}}

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

@@ -133,7 +133,7 @@ paths:
         - {name: tab, in: query, schema: {type: string, enum: [WAIT_MEASURE, WAIT_REVIEW, WAIT_FEE_SEND, INBOUNDED]}}
       responses:
         '200':
-          description: 成功或业务失败，按响应体 code 判断；每条记录携带后续租户隔离操作所需的 tenantId
+          description: 成功或业务失败，按响应体 code 判断；每条记录携带后续客户隔离操作所需的 tenantId，该字段当前表示客户 ID
           content:
             application/json:
               schema: {$ref: '#/components/schemas/InboundOrderPageEnvelope'}
@@ -184,7 +184,7 @@ paths:
         - {name: orderId, in: path, required: true, schema: {type: string, pattern: '^[1-9][0-9]*$'}}
       responses:
         '200': {description: 成功或业务失败，按响应体 code 判断}
-        '403': {description: 非本租户或无订单查看权限}
+        '403': {description: 非当前客户或无订单查看权限}
   /api/platform/v1/inbounds/{inboundId}/measurements/exception-release:
     post:
       summary: 测量异常放行
@@ -276,7 +276,7 @@ components:
       required: [id, tenantId]
       properties:
         id: {type: string, pattern: '^[1-9][0-9]*$'}
-        tenantId: {type: string, pattern: '^[1-9][0-9]*$', description: 记录所属企业租户 ID，用于详情和处理接口的租户隔离}
+        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}