Merge branch 'test' of http://8.163.30.128:10082/java-project/baiyue-firstleg into oy-test

2026-08-03 13:24:06 +08:00
parent 9eb03d4bce fa33d7b8ac
commit ced7f83038
45 changed files with 1479 additions and 403 deletions
@@ -16,11 +16,15 @@ CREATE TABLE IF NOT EXISTS iam_tenant (
  contact_name VARCHAR(64) NULL COMMENT '企业联系人',
  contact_phone VARCHAR(32) NULL COMMENT '联系电话',
  contact_email VARCHAR(128) NULL COMMENT '联系邮箱',
-  service_package VARCHAR(64) NULL COMMENT '客户服务套餐',
-  credit_days INT NOT NULL DEFAULT 0 COMMENT '账期天数',
-  sales_person VARCHAR(64) NULL COMMENT '负责销售人员',
-  business_address VARCHAR(255) NULL COMMENT '企业经营地址',
-  remark VARCHAR(500) NULL COMMENT '平台客户备注',
+  contact_wechat VARCHAR(64) NULL COMMENT '联系微信',
+  sales_owner_name VARCHAR(64) NULL COMMENT '销售负责人姓名',
+  payment_term_days SMALLINT UNSIGNED NULL COMMENT '账期天数',
+  enterprise_type VARCHAR(64) NULL COMMENT '企业类型',
+  established_date DATE NULL COMMENT '成立日期',
+  registered_capital DECIMAL(18,2) NULL COMMENT '注册资本',
+  registered_capital_currency CHAR(3) NULL COMMENT '注册资本币种 ISO 4217',
+  registered_address VARCHAR(500) NULL COMMENT '注册地址文本',
+  internal_remark VARCHAR(1000) NULL COMMENT '平台内部备注',
  approved_at DATETIME(3) NULL COMMENT '审核通过时间',
  approved_by BIGINT NULL COMMENT '审核人ID',
  reject_reason VARCHAR(500) NULL COMMENT '驳回原因',
@@ -0,0 +1,48 @@
+-- 一期平台客户档案字段增量迁移。可在同一数据库重复执行。
+USE baiyue_iam;
+SET NAMES utf8mb4;
+
+SET @ddl = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'contact_wechat'),
+  'SELECT 1', 'ALTER TABLE iam_tenant ADD COLUMN contact_wechat VARCHAR(64) NULL COMMENT ''联系微信'' AFTER contact_email');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'sales_owner_name'),
+  'SELECT 1', 'ALTER TABLE iam_tenant ADD COLUMN sales_owner_name VARCHAR(64) NULL COMMENT ''销售负责人姓名'' AFTER contact_wechat');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'payment_term_days'),
+  'SELECT 1', 'ALTER TABLE iam_tenant ADD COLUMN payment_term_days SMALLINT UNSIGNED NULL COMMENT ''账期天数'' AFTER sales_owner_name');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'enterprise_type'),
+  'SELECT 1', 'ALTER TABLE iam_tenant ADD COLUMN enterprise_type VARCHAR(64) NULL COMMENT ''企业类型'' AFTER payment_term_days');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'established_date'),
+  'SELECT 1', 'ALTER TABLE iam_tenant ADD COLUMN established_date DATE NULL COMMENT ''成立日期'' AFTER enterprise_type');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'registered_capital'),
+  'SELECT 1', 'ALTER TABLE iam_tenant ADD COLUMN registered_capital DECIMAL(18,2) NULL COMMENT ''注册资本'' AFTER established_date');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'registered_capital_currency'),
+  'SELECT 1', 'ALTER TABLE iam_tenant ADD COLUMN registered_capital_currency CHAR(3) NULL COMMENT ''注册资本币种 ISO 4217'' AFTER registered_capital');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'registered_address'),
+  'SELECT 1', 'ALTER TABLE iam_tenant ADD COLUMN registered_address VARCHAR(500) NULL COMMENT ''注册地址文本'' AFTER registered_capital_currency');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
+
+SET @ddl = IF(
+  EXISTS(SELECT 1 FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = 'iam_tenant' AND column_name = 'internal_remark'),
+  'SELECT 1', 'ALTER TABLE iam_tenant ADD COLUMN internal_remark VARCHAR(1000) NULL COMMENT ''平台内部备注'' AFTER registered_address');
+PREPARE stmt FROM @ddl; EXECUTE stmt; DEALLOCATE PREPARE stmt;
@@ -22,6 +22,7 @@ INSERT INTO iam_permission
  (id, tenant_id, app_code, permission_type, parent_id, permission_code, permission_name,
   sort_no, status, built_in, deleted)
 VALUES
+  (5100014, 0, 'PLATFORM', 'BUTTON', 5100010, 'platform:customer:view', '查看企业客户档案', 15, 'ACTIVE', 1, 0),
  (5100012, 0, 'PLATFORM', 'BUTTON', 5100010, 'platform:customer:edit', '编辑企业客户', 20, 'ACTIVE', 1, 0),
  (5100013, 0, 'PLATFORM', 'BUTTON', 5100010, 'platform:customer:status', '启停企业客户', 30, 'ACTIVE', 1, 0),
  (5101015, 0, 'PLATFORM', 'BUTTON', 5101010, 'platform:user:grant-role', '分配内部用户角色', 50, 'ACTIVE', 1, 0),
@@ -51,3 +52,18 @@ WHERE tenant_id = 0 AND app_code = 'PLATFORM'
    'platform:counterparty:list', 'platform:counterparty:create', 'platform:counterparty:edit', 'platform:counterparty:status'
  )
 ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);
+
+-- 详情查看从列表和审核权限中拆分；升级时保留既有运营角色的查询能力。
+INSERT INTO iam_role_permission (role_id, permission_id, tenant_id)
+SELECT DISTINCT existing_grant.role_id, view_permission.id, existing_grant.tenant_id
+FROM iam_role_permission existing_grant
+JOIN iam_permission existing_permission
+  ON existing_permission.id = existing_grant.permission_id
+JOIN iam_permission view_permission
+  ON view_permission.tenant_id = 0
+ AND view_permission.app_code = 'PLATFORM'
+ AND view_permission.permission_code = 'platform:customer:view'
+WHERE existing_permission.tenant_id = 0
+  AND existing_permission.app_code = 'PLATFORM'
+  AND existing_permission.permission_code IN ('platform:customer:list', 'platform:customer:review')
+ON DUPLICATE KEY UPDATE tenant_id = VALUES(tenant_id);