优化

2026-08-07 19:23:40 +08:00
parent 37fec1e012
commit c698290106
39 changed files with 1897 additions and 13 deletions
@@ -1559,6 +1559,14 @@ CALL phase1_add_column('ord_order_cargo', 'shipment_id', "VARCHAR(64) NULL COMME
 CALL phase1_add_column('ord_order_cargo', 'reference_id', "VARCHAR(64) NULL COMMENT 'Cargo Amazon Reference ID'");
 CALL phase1_add_column('ord_order_cargo', 'product_image_file_id', "BIGINT UNSIGNED NULL COMMENT 'Product image logical file ID'");

+UPDATE ord_order_cargo cargo
+JOIN ord_order orders ON orders.id = cargo.order_id AND orders.tenant_id = cargo.tenant_id
+SET cargo.shipment_id = COALESCE(NULLIF(cargo.shipment_id, ''), orders.shipment_id),
+    cargo.reference_id = COALESCE(NULLIF(cargo.reference_id, ''), orders.reference_id)
+WHERE orders.destination_type = 'FBA'
+  AND ((cargo.shipment_id IS NULL OR cargo.shipment_id = '')
+    OR (cargo.reference_id IS NULL OR cargo.reference_id = ''));
+
 DROP PROCEDURE phase1_add_column;

 -- 已有订单库的幂等记录迁移，和订单写入处于同一个本地事务。
@@ -3464,6 +3472,62 @@ SELECT 4000003, id, 0 FROM iam_permission
 WHERE id IN (5102061, 5102063, 5102065, 5102066, 5102067, 5102068)
 ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);

+-- 客户尺寸计算配置权限；与 FBA 计费规则相互独立。
+DROP PROCEDURE IF EXISTS unified_guard_dimension_config_permissions;
+DELIMITER $$
+CREATE PROCEDURE unified_guard_dimension_config_permissions()
+BEGIN
+  IF EXISTS (
+    SELECT 1 FROM iam_permission
+     WHERE (id = 5102111 AND COALESCE(permission_code, '') <> 'firstleg:dimension-config:view')
+        OR (id = 5102112 AND COALESCE(permission_code, '') <> 'firstleg:dimension-config:edit')
+  ) THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：客户尺寸计算配置权限固定ID已被其他权限码占用';
+  END IF;
+  IF EXISTS (
+    SELECT 1 FROM iam_permission
+     WHERE (permission_code = 'firstleg:dimension-config:view' AND id <> 5102111)
+        OR (permission_code = 'firstleg:dimension-config:edit' AND id <> 5102112)
+  ) THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：客户尺寸计算配置权限码已绑定其他固定ID';
+  END IF;
+END$$
+DELIMITER ;
+CALL unified_guard_dimension_config_permissions();
+DROP PROCEDURE IF EXISTS unified_guard_dimension_config_permissions;
+
+INSERT INTO iam_permission
+  (id, tenant_id, app_code, permission_type, parent_id, permission_code,
+   permission_name, route_path, http_method, sort_no, status, built_in, deleted)
+VALUES
+  (5102111, 0, 'PLATFORM', 'BUTTON', 5100010, 'firstleg:dimension-config:view',
+   '查看客户尺寸计算配置', NULL, NULL, 90, 'ACTIVE', 1, 0),
+  (5102112, 0, 'PLATFORM', 'BUTTON', 5100010, 'firstleg:dimension-config:edit',
+   '维护客户尺寸计算配置', NULL, NULL, 100, 'ACTIVE', 1, 0)
+ON DUPLICATE KEY UPDATE
+  permission_name = VALUES(permission_name), parent_id = VALUES(parent_id),
+  status = 'ACTIVE', built_in = 1, deleted = 0;
+
+INSERT INTO iam_role_permission (role_id, permission_id, tenant_id)
+SELECT r.id, p.id, 0
+  FROM iam_role r
+  JOIN iam_permission p
+    ON p.tenant_id = 0 AND p.app_code = 'PLATFORM'
+   AND p.permission_code IN ('firstleg:dimension-config:view', 'firstleg:dimension-config:edit')
+ WHERE r.tenant_id = 0 AND r.app_code = 'PLATFORM' AND r.role_code = 'PLATFORM_ADMIN'
+ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);
+
+INSERT INTO iam_role_permission (role_id, permission_id, tenant_id)
+SELECT r.id, p.id, 0
+  FROM iam_role r
+  JOIN iam_permission p
+    ON p.tenant_id = 0 AND p.app_code = 'PLATFORM'
+   AND p.permission_code = 'firstleg:dimension-config:view'
+ WHERE r.tenant_id = 0 AND r.app_code = 'PLATFORM' AND r.role_code = 'ORDER_OPERATOR'
+ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);
+
 -- ============================================================================
 -- 来源：iam\src\main\resources\db\phase2-location-permissions.sql
 -- ============================================================================
@@ -3745,7 +3809,8 @@ SET @phase2_permission_count = (
      'firstleg:fba-pricing:rule:edit', 'firstleg:fba-pricing:rate:view',
      'firstleg:fba-pricing:rate:edit', 'firstleg:fba-pricing:calculate',
      'firstleg:fba-pricing:confirm', 'firstleg:fba-pricing:view',
-      'firstleg:fba-pricing:adjust', 'platform:location:list',
+      'firstleg:fba-pricing:adjust', 'firstleg:dimension-config:view',
+      'firstleg:dimension-config:edit', 'platform:location:list',
      'platform:location:create', 'platform:location:edit', 'platform:location:status',
      'platform:location:delete', 'platform:pallet:list', 'platform:pallet:create',
      'platform:pallet:edit', 'platform:pallet:delete'
@@ -3756,9 +3821,9 @@ DROP PROCEDURE IF EXISTS unified_assert_permission_count;
 DELIMITER $$
 CREATE PROCEDURE unified_assert_permission_count()
 BEGIN
-  IF @phase2_permission_count <> 28 THEN
+  IF @phase2_permission_count <> 30 THEN
    SIGNAL SQLSTATE '45000'
-      SET MESSAGE_TEXT = '统一迁移失败：二期 IAM 权限资源未达到 28 项';
+      SET MESSAGE_TEXT = '统一迁移失败：二期 IAM 权限资源未达到 30 项';
  END IF;
 END$$
 DELIMITER ;
@@ -5013,6 +5078,24 @@ WHERE tenant_id = 0 AND app_code = 'PLATFORM'
  )
 ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);

+CREATE TABLE IF NOT EXISTS baiyue_firstleg.fl_customer_dimension_config (
+  id BIGINT UNSIGNED NOT NULL COMMENT '配置ID',
+  tenant_id BIGINT UNSIGNED NOT NULL COMMENT '客户隔离ID',
+  edge_addition_cm DECIMAL(6,3) NOT NULL DEFAULT 2.000 COMMENT '每个尺寸方向的单侧加宽厘米数',
+  remark VARCHAR(500) NULL COMMENT '备注',
+  initialization_key VARCHAR(128) NOT NULL COMMENT '创建流程幂等键及补偿归属',
+  created_by BIGINT UNSIGNED NOT NULL COMMENT '创建人ID',
+  created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  updated_by BIGINT UNSIGNED NOT NULL COMMENT '最后修改人ID',
+  updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  deleted TINYINT(1) NOT NULL DEFAULT 0 COMMENT '逻辑删除',
+  version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号',
+  PRIMARY KEY (id),
+  UNIQUE KEY uk_customer_dimension_config_tenant (tenant_id),
+  CONSTRAINT chk_customer_dimension_edge_addition
+    CHECK (edge_addition_cm >= 0.001 AND edge_addition_cm <= 100.000)
+) ENGINE=InnoDB COMMENT='客户尺寸计算配置';
+
 DROP PROCEDURE IF EXISTS unified_assert_final_extensions;
 DELIMITER $$
 CREATE PROCEDURE unified_assert_final_extensions()
@@ -5333,6 +5416,59 @@ BEGIN
    SIGNAL SQLSTATE '45000'
      SET MESSAGE_TEXT = '统一迁移失败：稳定箱号或单箱测量唯一约束未完整创建';
  END IF;
+  IF (SELECT COUNT(*) FROM information_schema.tables
+       WHERE table_schema = 'baiyue_firstleg'
+         AND table_name = 'fl_customer_dimension_config') <> 1 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：客户尺寸计算配置表未创建';
+  END IF;
+  IF (SELECT COUNT(*) FROM information_schema.statistics
+       WHERE table_schema = 'baiyue_firstleg'
+         AND table_name = 'fl_customer_dimension_config'
+         AND index_name = 'uk_customer_dimension_config_tenant'
+         AND non_unique = 0) <> 1 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：客户尺寸计算配置唯一约束未创建';
+  END IF;
+  IF (SELECT COUNT(*) FROM baiyue_iam.iam_permission
+       WHERE id = 5100010 AND tenant_id = 0 AND app_code = 'PLATFORM'
+         AND permission_code = 'platform:customer:list' AND permission_name = '企业客户'
+         AND status = 'ACTIVE' AND deleted = 0) <> 1 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：客户尺寸计算配置权限父节点企业客户不存在';
+  END IF;
+  IF (SELECT COUNT(*) FROM baiyue_iam.iam_permission
+       WHERE tenant_id = 0 AND app_code = 'PLATFORM' AND permission_type = 'BUTTON'
+         AND parent_id = 5100010 AND status = 'ACTIVE' AND deleted = 0
+         AND ((id = 5102111 AND permission_code = 'firstleg:dimension-config:view')
+           OR (id = 5102112 AND permission_code = 'firstleg:dimension-config:edit'))) <> 2 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：客户尺寸计算配置权限码、固定ID或父节点不正确';
+  END IF;
+  IF (SELECT COUNT(DISTINCT p.permission_code)
+        FROM baiyue_iam.iam_role_permission rp
+        JOIN baiyue_iam.iam_role r ON r.id = rp.role_id AND r.tenant_id = rp.tenant_id
+        JOIN baiyue_iam.iam_permission p ON p.id = rp.permission_id AND p.tenant_id = rp.tenant_id
+       WHERE r.tenant_id = 0 AND r.app_code = 'PLATFORM' AND r.role_code = 'PLATFORM_ADMIN'
+         AND p.permission_code IN ('firstleg:dimension-config:view', 'firstleg:dimension-config:edit')) <> 2 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：平台管理员未获得客户尺寸计算配置读写权限';
+  END IF;
+  IF (SELECT COUNT(DISTINCT p.permission_code)
+        FROM baiyue_iam.iam_role_permission rp
+        JOIN baiyue_iam.iam_role r ON r.id = rp.role_id AND r.tenant_id = rp.tenant_id
+        JOIN baiyue_iam.iam_permission p ON p.id = rp.permission_id AND p.tenant_id = rp.tenant_id
+       WHERE r.tenant_id = 0 AND r.app_code = 'PLATFORM' AND r.role_code = 'ORDER_OPERATOR'
+         AND p.permission_code = 'firstleg:dimension-config:view') <> 1
+     OR (SELECT COUNT(*)
+           FROM baiyue_iam.iam_role_permission rp
+           JOIN baiyue_iam.iam_role r ON r.id = rp.role_id AND r.tenant_id = rp.tenant_id
+           JOIN baiyue_iam.iam_permission p ON p.id = rp.permission_id AND p.tenant_id = rp.tenant_id
+          WHERE r.tenant_id = 0 AND r.app_code = 'PLATFORM' AND r.role_code = 'ORDER_OPERATOR'
+            AND p.permission_code = 'firstleg:dimension-config:edit') <> 0 THEN
+    SIGNAL SQLSTATE '45000'
+      SET MESSAGE_TEXT = '统一迁移失败：订单运营角色的客户尺寸计算配置权限不是只读';
+  END IF;
 END$$
 DELIMITER ;
 CALL unified_assert_final_extensions();