优化

deploy/sql/README.md

@@ -186,6 +186,28 @@ SELECT
 
 上述三个结果 `public_scope_violations`、`customer_scope_violations`、`parent_child_scope_mismatches` 必须都为 `0`。
 
+## 船司 FBA 价格公共作用域迁移
+
+- `fl_carrier_fba_rate` 的船司 FBA 价格固定归平台作用域 `tenant_id = 0`；客户计费规则仍按客户 `tenant_id > 0` 隔离。
+- 固定入口会先检查存量价格的 `(rate_code, rate_version)` 重复，以及相同匹配维度的有效期重叠；发现冲突时通过 `SQLSTATE 45000` 中止，不会自动覆盖价格。
+- 无冲突时，固定入口才会把存量船司价格迁移到 `tenant_id = 0`，并在末尾验证不存在非平台价格作用域。迁移完成后再启动或重启 `firstleg-service`。
+
+执行前可只读盘点：
+
+```sql
+SELECT tenant_id, COUNT(*) AS total
+  FROM baiyue_firstleg.fl_carrier_fba_rate
+ GROUP BY tenant_id
+ ORDER BY tenant_id;
+
+SELECT rate_code, rate_version, COUNT(*) AS total
+  FROM baiyue_firstleg.fl_carrier_fba_rate
+ GROUP BY rate_code, rate_version
+HAVING COUNT(*) > 1;
+```
+
+如果固定入口因价格冲突中止，应先由业务确认保留版本、有效期和价格金额，再清理冲突后重新完整执行脚本；不要直接手工把冲突记录改为 `0`。
+
 ## 海外仓阶梯费用增量
 
 - `2026-08-05` 增量已追加到固定入口末尾，不创建新的日期部署脚本。

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

@@ -2527,8 +2527,8 @@ CREATE TABLE IF NOT EXISTS fl_customer_charge_rule (
 
 CREATE TABLE IF NOT EXISTS fl_carrier_fba_rate (
   id BIGINT UNSIGNED NOT NULL COMMENT '船司FBA价格ID',
-  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '数据所属租户ID',
-  rate_code VARCHAR(50) NOT NULL COMMENT '租户内价格编码',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '平台价格作用域ID，船司价格固定为0',
+  rate_code VARCHAR(50) NOT NULL COMMENT '平台公共价格编码',
   rate_version INT UNSIGNED NOT NULL COMMENT '价格版本号',
   origin_warehouse_id BIGINT UNSIGNED NOT NULL COMMENT '起运仓逻辑ID',
   origin_warehouse_name VARCHAR(128) NOT NULL COMMENT '起运仓名称快照',
@@ -3053,6 +3053,61 @@ PREPARE stmt FROM @sql; EXECUTE stmt; DEALLOCATE PREPARE stmt;
 
 DROP PROCEDURE IF EXISTS phase2_fba_add_column;
 
+-- 船司 FBA 价格是平台公共主数据；迁移前检查版本和有效期冲突，避免静默覆盖客户价格。
+DROP PROCEDURE IF EXISTS phase2_fba_migrate_carrier_rate_scope;
+DELIMITER $$
+CREATE PROCEDURE phase2_fba_migrate_carrier_rate_scope()
+BEGIN
+  DECLARE v_conflicts INT DEFAULT 0;
+
+  SELECT COUNT(*) INTO v_conflicts
+  FROM (
+    SELECT rate_code, rate_version
+    FROM fl_carrier_fba_rate
+    GROUP BY rate_code, rate_version
+    HAVING COUNT(*) > 1
+  ) AS duplicate_versions;
+  IF v_conflicts > 0 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = 'FBA价格迁移失败：不同客户存在重复价格编码版本，请先合并';
+  END IF;
+
+  SELECT COUNT(*) INTO v_conflicts
+  FROM (
+    SELECT first_rate.id
+    FROM fl_carrier_fba_rate first_rate
+    JOIN fl_carrier_fba_rate second_rate
+      ON first_rate.id < second_rate.id
+     AND first_rate.status = 'ACTIVE'
+     AND second_rate.status = 'ACTIVE'
+     AND first_rate.origin_warehouse_id <=> second_rate.origin_warehouse_id
+     AND first_rate.business_type <=> second_rate.business_type
+     AND first_rate.channel_code <=> second_rate.channel_code
+     AND first_rate.carrier_id <=> second_rate.carrier_id
+     AND first_rate.destination_code <=> second_rate.destination_code
+     AND first_rate.charge_unit <=> second_rate.charge_unit
+     AND first_rate.effective_from < COALESCE(second_rate.effective_to, '9999-12-31 23:59:59.999')
+     AND second_rate.effective_from < COALESCE(first_rate.effective_to, '9999-12-31 23:59:59.999')
+     LIMIT 1
+  ) AS overlapping_rates;
+  IF v_conflicts > 0 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = 'FBA价格迁移失败：公共匹配维度存在有效期重叠，请先合并';
+  END IF;
+
+  UPDATE fl_carrier_fba_rate
+  SET tenant_id = 0
+  WHERE tenant_id <> 0;
+
+  IF EXISTS (SELECT 1 FROM fl_carrier_fba_rate WHERE tenant_id <> 0) THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = 'FBA价格迁移失败：仍存在非平台价格作用域';
+  END IF;
+END$$
+DELIMITER ;
+CALL phase2_fba_migrate_carrier_rate_scope();
+DROP PROCEDURE IF EXISTS phase2_fba_migrate_carrier_rate_scope;
+
 -- 旧索引可能缺少业务类型、船司和结束时间；用新索引名并存，避免破坏线上依赖。
 SET @idx_exists = (SELECT COUNT(*) FROM information_schema.STATISTICS
   WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'fl_carrier_fba_rate' AND INDEX_NAME = 'idx_fba_rate_unique_match');