优化

warehouse/src/main/resources/db/phase1-warehouse-schema-migration.sql

@@ -48,6 +48,22 @@ CALL add_column_if_missing('wh_warehouse', 'updated_by', 'BIGINT UNSIGNED NULL')
 CALL add_column_if_missing('wh_warehouse', 'updated_at', 'DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3)');
 CALL add_column_if_missing('wh_warehouse', 'deleted', 'TINYINT(1) NOT NULL DEFAULT 0');
 CALL add_column_if_missing('wh_warehouse', 'version', 'INT NOT NULL DEFAULT 0');
+CALL add_column_if_missing('wh_overseas_storage_fee_rule', 'initialization_key', 'VARCHAR(191) NULL');
+CALL add_column_if_missing('wh_overseas_storage_fee_tier', 'fee_type', 'VARCHAR(32) NOT NULL DEFAULT ''STORAGE''');
+CALL add_column_if_missing('wh_overseas_storage_fee_tier', 'billing_unit', 'VARCHAR(16) NOT NULL DEFAULT ''CBM''');
+
+-- 海外仓费用旧表兼容：允许免费档和“第 N 天以上”，并同步检查约束。
+ALTER TABLE wh_overseas_storage_fee_tier
+  MODIFY COLUMN end_day SMALLINT UNSIGNED NULL COMMENT '结束天，含边界；NULL表示以上',
+  MODIFY COLUMN unit_price DECIMAL(18,6) NOT NULL COMMENT '仓储费标准，可为0';
+ALTER TABLE wh_overseas_storage_fee_tier
+  DROP CHECK chk_overseas_fee_tier_days,
+  DROP CHECK chk_overseas_fee_tier_price,
+  ADD CONSTRAINT chk_overseas_fee_tier_days CHECK (start_day >= 1 AND (end_day IS NULL OR end_day >= start_day)),
+  ADD CONSTRAINT chk_overseas_fee_tier_price CHECK (unit_price >= 0);
+ALTER TABLE wh_overseas_storage_fee_tier
+  DROP INDEX uk_overseas_fee_tier_start,
+  ADD UNIQUE KEY uk_overseas_fee_tier_start (rule_id, fee_type, active_start_day);
 
 CALL add_column_if_missing('wh_warehouse_address', 'tenant_id', 'BIGINT UNSIGNED NOT NULL DEFAULT 0 AFTER id');
 CALL add_column_if_missing('wh_warehouse_address', 'warehouse_id', 'BIGINT UNSIGNED NOT NULL DEFAULT 0 AFTER tenant_id');

warehouse/src/main/resources/db/warehouse.sql

@@ -75,3 +75,27 @@ CREATE TABLE IF NOT EXISTS wh_service_capability (
 ) ENGINE=InnoDB COMMENT='仓库服务能力表：声明仓库可提供的收货、仓储、拣包、退货等能力及截单时间';
 
 -- 不使用跨服务数据库外键；仓库聚合内的归属由服务代码通过 tenant_id 与 warehouse_id 共同校验。
+
+CREATE TABLE IF NOT EXISTS wh_overseas_storage_fee_rule (
+  id BIGINT UNSIGNED NOT NULL, tenant_id BIGINT UNSIGNED NOT NULL, customer_name VARCHAR(128) NOT NULL,
+  currency CHAR(3) NOT NULL DEFAULT 'USD', initialization_key VARCHAR(191) NULL,
+  created_by BIGINT UNSIGNED NULL, created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  updated_by BIGINT UNSIGNED NULL, updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+  deleted TINYINT(1) NOT NULL DEFAULT 0, version INT NOT NULL DEFAULT 0,
+  active_customer_id BIGINT UNSIGNED GENERATED ALWAYS AS (CASE WHEN deleted=0 THEN tenant_id ELSE NULL END) STORED,
+  PRIMARY KEY(id), UNIQUE KEY uk_overseas_fee_active_customer(active_customer_id), KEY idx_overseas_fee_page(deleted,updated_at,id)
+) ENGINE=InnoDB COMMENT='客户海外仓费用规则';
+
+CREATE TABLE IF NOT EXISTS wh_overseas_storage_fee_tier (
+  id BIGINT UNSIGNED NOT NULL, tenant_id BIGINT UNSIGNED NOT NULL, rule_id BIGINT UNSIGNED NOT NULL,
+  start_day SMALLINT UNSIGNED NOT NULL, end_day SMALLINT UNSIGNED NULL,
+  fee_type VARCHAR(32) NOT NULL DEFAULT 'STORAGE', billing_unit VARCHAR(16) NOT NULL DEFAULT 'CBM',
+  unit_price DECIMAL(18,6) NOT NULL, sort_no SMALLINT UNSIGNED NOT NULL,
+  created_by BIGINT UNSIGNED NULL, created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+  updated_by BIGINT UNSIGNED NULL, updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
+  deleted TINYINT(1) NOT NULL DEFAULT 0, version INT NOT NULL DEFAULT 0,
+  active_start_day SMALLINT UNSIGNED GENERATED ALWAYS AS (CASE WHEN deleted=0 THEN start_day ELSE NULL END) STORED,
+  PRIMARY KEY(id), UNIQUE KEY uk_overseas_fee_tier_start(rule_id,fee_type,active_start_day), KEY idx_overseas_fee_tier_rule(tenant_id,rule_id,deleted,sort_no,id),
+  CONSTRAINT chk_overseas_fee_tier_days CHECK (start_day>=1 AND (end_day IS NULL OR end_day>=start_day)),
+  CONSTRAINT chk_overseas_fee_tier_price CHECK (unit_price>=0)
+) ENGINE=InnoDB COMMENT='客户海外仓费用阶梯';