优化

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

@@ -145,3 +145,6 @@ PREPARE statement FROM @sql; EXECUTE statement; DEALLOCATE PREPARE statement;
 SET @sql = IF((SELECT COUNT(*) FROM information_schema.statistics WHERE table_schema = @schema_name AND table_name = 'wh_express_company' AND index_name = 'uk_wh_express_tenant_code') = 0,
   'ALTER TABLE wh_express_company ADD UNIQUE KEY uk_wh_express_tenant_code (tenant_id, company_code, deleted)', 'SELECT 1');
 PREPARE statement FROM @sql; EXECUTE statement; DEALLOCATE PREPARE statement;
+SET @sql = IF((SELECT COUNT(*) FROM information_schema.statistics WHERE table_schema = @schema_name AND table_name = 'wh_express_company' AND index_name = 'uk_wh_express_tenant_name') = 0,
+  'ALTER TABLE wh_express_company ADD UNIQUE KEY uk_wh_express_tenant_name (tenant_id, company_name, deleted)', 'SELECT 1');
+PREPARE statement FROM @sql; EXECUTE statement; DEALLOCATE PREPARE statement;

warehouse/src/main/resources/db/warehouse-express-company.sql

@@ -19,5 +19,6 @@ CREATE TABLE IF NOT EXISTS wh_express_company (
   version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
   PRIMARY KEY (id),
   UNIQUE KEY uk_wh_express_tenant_code (tenant_id, company_code, deleted),
+  UNIQUE KEY uk_wh_express_tenant_name (tenant_id, company_name, deleted),
   KEY idx_wh_express_tenant_status (tenant_id, status, deleted)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='租户维度快递公司主数据';

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

@@ -2,19 +2,30 @@ SET NAMES utf8mb4;
 USE baiyue_warehouse;
 CREATE TABLE IF NOT EXISTS wh_partner (
  id BIGINT UNSIGNED NOT NULL, tenant_id BIGINT UNSIGNED NOT NULL,
+ data_scope_id BIGINT UNSIGNED NOT NULL COMMENT '所属业务数据范围',
  partner_code VARCHAR(50) NOT NULL, partner_name VARCHAR(128) NOT NULL,
  partner_type VARCHAR(20) NOT NULL COMMENT 'CUSTOMER、SUPPLIER或BOTH',
  contact_name VARCHAR(64) NOT NULL, contact_phone VARCHAR(32) NOT NULL,
  contact_email VARCHAR(128) NULL, country_code CHAR(2) NOT NULL,
  province VARCHAR(64) NULL, city VARCHAR(64) NOT NULL, district VARCHAR(64) NULL,
  address_line VARCHAR(255) NOT NULL, postal_code VARCHAR(20) NULL,
- status VARCHAR(20) NOT NULL DEFAULT 'ACTIVE', created_by BIGINT UNSIGNED NULL,
+ status VARCHAR(20) NOT NULL DEFAULT 'ACTIVE', remark VARCHAR(500) 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,
  PRIMARY KEY(id), UNIQUE KEY uk_wh_partner_tenant_code(tenant_id,partner_code,deleted),
  KEY idx_wh_partner_tenant_status(tenant_id,status,deleted)
 ) ENGINE=InnoDB COMMENT='仓储域内的租户往来单位配置';
-INSERT INTO wh_partner(id,tenant_id,partner_code,partner_name,partner_type,contact_name,contact_phone,contact_email,country_code,province,city,district,address_line,postal_code,status)
-VALUES(191000000000000001,10001,'CUS-001','深圳示例贸易有限公司','CUSTOMER','张三','13800138000','contact@example.com','CN','广东省','深圳市','宝安区','航城街道示例路1号','518000','ACTIVE')
+CREATE TABLE IF NOT EXISTS wh_partner_type (
+ partner_id BIGINT UNSIGNED NOT NULL, tenant_id BIGINT UNSIGNED NOT NULL,
+ data_scope_id BIGINT UNSIGNED NOT NULL, partner_type VARCHAR(32) NOT NULL,
+ PRIMARY KEY(partner_id,partner_type),
+ KEY idx_wh_partner_type_scope(tenant_id,data_scope_id,partner_type,partner_id)
+) ENGINE=InnoDB COMMENT='往来单位稳定业务类型';
+INSERT INTO wh_partner(id,tenant_id,data_scope_id,partner_code,partner_name,partner_type,contact_name,contact_phone,contact_email,country_code,province,city,district,address_line,postal_code,status)
+VALUES(191000000000000001,10001,10001,'CUS-001','深圳示例贸易有限公司','CUSTOMER','张三','13800138000','contact@example.com','CN','广东省','深圳市','宝安区','航城街道示例路1号','518000','ACTIVE')
 ON DUPLICATE KEY UPDATE partner_name=VALUES(partner_name),status='ACTIVE';
+INSERT INTO wh_partner_type(partner_id,tenant_id,data_scope_id,partner_type)
+VALUES(191000000000000001,10001,10001,'CUSTOMER')
+ON DUPLICATE KEY UPDATE tenant_id=VALUES(tenant_id),data_scope_id=VALUES(data_scope_id);