Merge branch 'cursor/self-input-stats'

2026-05-22 17:02:27 +08:00
parent 7e94c5dfd7 679e61057b
commit 4b749a1ee0
6 changed files with 71 additions and 26 deletions
@@ -1,10 +1,15 @@
-- 自录业绩/账户消耗：确保唯一索引为「同录入人 + 同日 + 同渠道」。
-- 可重复执行：不存在则跳过删除；目标索引已存在则跳过添加。
+-- 自录业绩/账户消耗：把唯一索引补上 delete_time，使软删后可重新录入。
 --
-- 适用场景：
-- 1) 曾改为 uk_date_media（全局唯一）的环境 → 删除 uk_date_media，恢复 uk_creator_date_media
-- 2) 一直是 uk_creator_date_media 的环境 → 本脚本全部跳过，不会报 1091
-- 3) 尚无唯一索引的环境 → 直接添加 uk_creator_date_media
+-- 背景：
+--   旧索引 uk_creator_date_media = (creator_id, date, media_source) 不含 delete_time，
+--   软删的历史记录会继续占用唯一键，导致同账号同日同渠道再次新增触发 MySQL 1062。
+--
+-- 新索引 uk_creator_date_media = (creator_id, date, media_source, delete_time)
+--   MySQL 中 NULL ≠ NULL：
+--     - 活跃记录 delete_time = NULL，最多 1 条（行为不变，仍唯一）
+--     - 软删后 delete_time 变成时间戳，与新插入的 NULL 不冲突 → 允许重新录入
+--
+-- 可重复执行：先检查再操作，避免 1091/1061 报错。

 -- ========== 查看当前索引（可选） ==========
 SELECT
@@ -19,6 +24,7 @@ GROUP BY TABLE_NAME, INDEX_NAME
 ORDER BY TABLE_NAME, INDEX_NAME;

 -- ========== zyt_personal_yeji ==========
+-- 清理可能存在的旧版「全局唯一」索引
 SET @sql = IF(
    (SELECT COUNT(*) FROM information_schema.STATISTICS
     WHERE TABLE_SCHEMA = DATABASE()
@@ -31,18 +37,23 @@ PREPARE stmt FROM @sql;
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;

+-- 删除旧的 3 列唯一索引（若存在）
 SET @sql = IF(
    (SELECT COUNT(*) FROM information_schema.STATISTICS
     WHERE TABLE_SCHEMA = DATABASE()
       AND TABLE_NAME = 'zyt_personal_yeji'
-       AND INDEX_NAME = 'uk_creator_date_media') = 0,
-    'ALTER TABLE `zyt_personal_yeji` ADD UNIQUE KEY `uk_creator_date_media` (`creator_id`, `yeji_date`, `media_source`)',
-    'SELECT ''zyt_personal_yeji: uk_creator_date_media 已存在，跳过添加'' AS message'
+       AND INDEX_NAME = 'uk_creator_date_media') > 0,
+    'ALTER TABLE `zyt_personal_yeji` DROP INDEX `uk_creator_date_media`',
+    'SELECT ''zyt_personal_yeji: 无 uk_creator_date_media，跳过删除'' AS message'
 );
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;

+-- 添加 4 列唯一索引（包含 delete_time）
+ALTER TABLE `zyt_personal_yeji`
+    ADD UNIQUE KEY `uk_creator_date_media` (`creator_id`, `yeji_date`, `media_source`, `delete_time`);
+
 -- ========== zyt_personal_account_cost ==========
 SET @sql = IF(
    (SELECT COUNT(*) FROM information_schema.STATISTICS
@@ -60,10 +71,13 @@ SET @sql = IF(
    (SELECT COUNT(*) FROM information_schema.STATISTICS
     WHERE TABLE_SCHEMA = DATABASE()
       AND TABLE_NAME = 'zyt_personal_account_cost'
-       AND INDEX_NAME = 'uk_creator_date_media') = 0,
-    'ALTER TABLE `zyt_personal_account_cost` ADD UNIQUE KEY `uk_creator_date_media` (`creator_id`, `cost_date`, `media_source`)',
-    'SELECT ''zyt_personal_account_cost: uk_creator_date_media 已存在，跳过添加'' AS message'
+       AND INDEX_NAME = 'uk_creator_date_media') > 0,
+    'ALTER TABLE `zyt_personal_account_cost` DROP INDEX `uk_creator_date_media`',
+    'SELECT ''zyt_personal_account_cost: 无 uk_creator_date_media，跳过删除'' AS message'
 );
 PREPARE stmt FROM @sql;
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
+
+ALTER TABLE `zyt_personal_account_cost`
+    ADD UNIQUE KEY `uk_creator_date_media` (`creator_id`, `cost_date`, `media_source`, `delete_time`);
@@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS `zyt_personal_account_cost` (
  `update_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间',
  `delete_time` int(11) unsigned DEFAULT NULL COMMENT '删除时间',
  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_creator_date_media` (`creator_id`, `cost_date`, `media_source`),
+  UNIQUE KEY `uk_creator_date_media` (`creator_id`, `cost_date`, `media_source`, `delete_time`),
  KEY `idx_cost_date` (`cost_date`),
  KEY `idx_creator_id` (`creator_id`),
  KEY `idx_dept_id` (`dept_id`)
@@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `zyt_personal_yeji` (
  `update_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间',
  `delete_time` int(11) unsigned DEFAULT NULL COMMENT '删除时间',
  PRIMARY KEY (`id`),
-  UNIQUE KEY `uk_creator_date_media` (`creator_id`, `yeji_date`, `media_source`),
+  UNIQUE KEY `uk_creator_date_media` (`creator_id`, `yeji_date`, `media_source`, `delete_time`),
  KEY `idx_yeji_date` (`yeji_date`),
  KEY `idx_creator_id` (`creator_id`),
  KEY `idx_dept_id` (`dept_id`)