refactor: 彻底删除 children 表及相关代码，迁移至 family_members

- 删除 Child.java、ChildMapper.java 实体与 Mapper
- 清理 AccountCleanupService/TaskStatsService/GrowthTaskService/DatabaseSyncService 死引用
- DatabaseInitializer 清理 4 处 children 残留迁移，新增迁移320（幂等迁移数据 + DROP TABLE）
- 修复 ChildBadgeMapper.selectFamilyRanking、GameRecordMapper.selectLeaderboard 两个查询 children 表的遗留 bug
- 解决既存 git stash 冲突标记（迁移318 DOA 三表 + 系统提示词菜单 + 迁移319 health_plan 合并保留）
- schema.sql 三处迁移编号 299→320，清理过时注释
- 同步 AGENTS.md 更新 children 已删除口径

AGENTS.md

@@ -95,6 +95,7 @@ opencode web --port 4090 --hostname 127.0.0.1
 - **能登录用户**：`family_members.userId` 非空且关联 User 有 openid（VO 层 `memberType=login`）
 - **不能登录用户**（历史称"孩子"）：`family_members.userId` 为空或关联 User 无 openid（VO 层 `memberType=local`），由同家庭能登录用户代管其数据（任务/健康/DOA 等）
 - 新功能禁止再引入"孩子"概念，统一用"能登录用户/不能登录用户"表述
+- **已废弃**：`children` 表已删除（数据由 DatabaseInitializer 迁移322 迁移至 `family_members` 后 DROP），相关实体/Mapper 已清理
 
 ## cfclub 新特性
 

cfc-backend/AGENTS.md

@@ -56,6 +56,7 @@ Spring Boot 2.7.18 后端服务，MyBatis-Plus ORM，JWT 认证。
 - **能登录用户**：`family_members.userId` 非空且关联 User 有 openid（VO 层 `memberType=login`）
 - **不能登录用户**（历史称"孩子"）：`family_members.userId` 为空或关联 User 无 openid（VO 层 `memberType=local`），由同家庭能登录用户代管其数据（任务/健康/DOA 等）
 - 新功能禁止再引入"孩子"概念，统一用"能登录用户/不能登录用户"表述
+- **已废弃**：`children` 表已删除（数据由 DatabaseInitializer 迁移322 迁移至 `family_members` 后 DROP），相关实体/Mapper 已清理
 
 ## ANTI-PATTERNS (本项目禁止)
 

cfc-backend/src/main/java/com/etotem/cfc/config/DatabaseInitializer.java

@@ -202,26 +202,10 @@ public class DatabaseInitializer implements CommandLineRunner {
         try {
             jdbcTemplate.execute("ALTER TABLE users ADD INDEX idx_phone (phone)");
             log.info("已添加idx_phone索引到users表");
-        } catch (Exception e) {
-            // 索引已存在，忽略错误
-        }
-
-        // 迁移4: children表添加新字段
-        try {
-            jdbcTemplate.execute("ALTER TABLE children ADD COLUMN birthday DATE COMMENT '生日'");
-            log.info("已添加birthday列到children表");
-        } catch (Exception e) {
-            // 列已存在，忽略错误
-        }
+} catch (Exception e) {
 
-        try {
-            jdbcTemplate.execute("ALTER TABLE children ADD COLUMN gender ENUM('male', 'female') COMMENT '性别'");
-            log.info("已添加gender列到children表");
-        } catch (Exception e) {
-            // 列已存在，忽略错误
         }
 
-        // 迁移5: 修改users.role为支持teacher
         try {
             jdbcTemplate.execute("ALTER TABLE users MODIFY COLUMN role ENUM('parent', 'child', 'teacher') NOT NULL");
             log.info("已更新users.role字段支持teacher角色");
@@ -782,26 +766,11 @@ public class DatabaseInitializer implements CommandLineRunner {
                     "INDEX idx_action (action)" +
                     ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成长规划师申请过程记录表'");
             log.info("已创建guide_application_records表");
-        } catch (Exception e) {
-            // 表已存在，忽略错误
-        }
+} catch (Exception e) {
 
-        // 迁移20: children表添加system_points字段
-        try {
-            Integer exists = jdbcTemplate.queryForObject(
-                    "SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'children' AND COLUMN_NAME = 'system_points'",
-                    Integer.class);
-            if (exists == null || exists == 0) {
-                jdbcTemplate.execute("ALTER TABLE children ADD COLUMN system_points INT DEFAULT 0 COMMENT '系统积分'");
-                log.info("已添加system_points列到children表");
-            } else {
-                log.info("system_points列已存在，跳过");
-            }
-        } catch (Exception e) {
-            log.warn("检查/添加system_points列失败: {}", e.getMessage());
         }
 
-        // 迁移21: points_log表添加category字段
+
         try {
             Integer exists = jdbcTemplate.queryForObject(
                     "SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'points_log' AND COLUMN_NAME = 'category'",
@@ -2108,26 +2077,11 @@ public class DatabaseInitializer implements CommandLineRunner {
             } else {
                 log.info("family_member_attributes 表已为 v1.2 结构，跳过");
             }
-        } catch (Exception e) {
+} catch (Exception e) {
             log.warn("重建 family_member_attributes 表失败: {}", e.getMessage());
         }
 
-        // 迁移: children 表添加 show_to_family 列（v1.3 家庭成员卡）
-        try {
-            Integer colExists = jdbcTemplate.queryForObject(
-                    "SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'children' AND COLUMN_NAME = 'show_to_family'",
-                    Integer.class);
-            if (colExists == null || colExists == 0) {
-                jdbcTemplate.execute("ALTER TABLE children ADD COLUMN show_to_family TINYINT DEFAULT 1 COMMENT '是否对家庭成员可见: 1=是, 0=否'");
-                log.info("已为 children 表添加 show_to_family 列");
-            } else {
-                log.info("children 表 show_to_family 列已存在，跳过");
-            }
-        } catch (Exception e) {
-            log.warn("检查/添加 children 表 show_to_family 列失败: {}", e.getMessage());
-        }
 
-        // 迁移: users 表添加 show_to_family 列（v1.3 家庭成员卡）
         try {
             Integer colExists = jdbcTemplate.queryForObject(
                     "SELECT COUNT(*) FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'users' AND COLUMN_NAME = 'show_to_family'",
@@ -6496,14 +6450,10 @@ sqls.add("INSERT IGNORE INTO health_norm_reference (dimension, gender, age_min,
         try {
             jdbcTemplate.execute("ALTER TABLE emotion_checkin MODIFY COLUMN emotion_type VARCHAR(50) DEFAULT 'custom' COMMENT '情绪类型'");
             log.info("已修改emotion_checkin.emotion_type为VARCHAR");
-        } catch (Exception e) {
+} catch (Exception e) {
             log.warn("修改emotion_checkin.emotion_type可能已处理: {}", e.getMessage());
         }
 
-        // 迁移127: children表添加name列（兼容旧SQL查询如游戏排行榜LEFT JOIN）
-        ensureColumn("children", "name", "VARCHAR(50) DEFAULT NULL COMMENT '姓名(兼容旧查询)'");
-
-        // 迁移128: family_fortune表添加缺失列
         ensureColumn("family_fortune", "fortune_level_text", "VARCHAR(50) DEFAULT NULL COMMENT '运势等级文字'");
         ensureColumn("family_fortune", "fortune_description", "VARCHAR(500) DEFAULT NULL COMMENT '运势描述'");
         ensureColumn("family_fortune", "mood_emoji", "VARCHAR(20) DEFAULT NULL COMMENT '心情表情'");
@@ -10552,12 +10502,56 @@ sqls.add("INSERT IGNORE INTO health_norm_reference (dimension, gender, age_min,
                 "WHERE u.role='child' AND (u.openid IS NULL OR u.openid='') " +
                 "AND u.family_id IS NOT NULL " +
                 "AND NOT EXISTS (SELECT 1 FROM family_members fm WHERE fm.user_id = u.id)");
-            log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记录");
+log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记录");
         } catch (Exception e) {
             log.warn("迁移298第二步失败", e);
         }
 
-        // 迁移299: promotion_tier 表添加 rate_percent 列（实体新模型返佣比例；修复 PromotionTierCheckScheduledTask 每天01:00 Unknown column 崩溃，2026-09-06）
+
+// 迁移322: 废弃 children 表 —— 数据迁移到 family_members 后删除表（幂等，表不存在时跳过）
+        try {
+            Integer childrenTableCnt = jdbcTemplate.queryForObject(
+                    "SELECT COUNT(*) FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'children'",
+                    Integer.class);
+            if (childrenTableCnt == null || childrenTableCnt == 0) {
+                log.info("迁移322: children 表不存在，跳过（已废弃）");
+            } else {
+                // 1. 匹配更新：family_members 已存在该成员记录时补全字段
+                jdbcTemplate.execute(
+                        "UPDATE family_members fm INNER JOIN children c " +
+                        "ON fm.family_id = c.family_id AND fm.nickname = c.nickname AND fm.user_id = c.user_id " +
+                        "SET fm.id_card = c.id_card, fm.penalty_enabled = c.penalty_enabled, fm.theme = c.theme, " +
+                        "fm.system_points = c.system_points, fm.streak_days = c.streak_days, fm.last_task_date = c.last_task_date, " +
+                        "fm.focus_max_daily = c.focus_max_daily, fm.focus_remaining = c.focus_remaining, " +
+                        "fm.focus_reset_date = c.focus_reset_date, fm.total_points = c.total_points, " +
+                        "fm.show_to_family = c.show_to_family, fm.birthday = c.birthday, fm.gender = c.gender, " +
+                        "fm.phone = c.phone, fm.role_override = 'child'");
+                log.info("迁移322: 已更新 family_members 中已存在的 children 匹配记录字段");
+
+                // 2. 不匹配则插入新记录
+                jdbcTemplate.execute(
+                        "INSERT INTO family_members (family_id, user_id, nickname, birthday, gender, phone, " +
+                        "id_card, penalty_enabled, theme, system_points, streak_days, last_task_date, " +
+                        "focus_max_daily, focus_remaining, focus_reset_date, show_to_family, total_points, " +
+                        "role_override, created_at, updated_at) " +
+                        "SELECT family_id, user_id, nickname, birthday, gender, phone, " +
+                        "id_card, penalty_enabled, theme, system_points, streak_days, last_task_date, " +
+                        "focus_max_daily, focus_remaining, focus_reset_date, show_to_family, total_points, " +
+                        "'child', created_at, updated_at " +
+                        "FROM children " +
+                        "WHERE NOT EXISTS (SELECT 1 FROM family_members fm2 WHERE fm2.family_id = children.family_id " +
+                        "AND fm2.nickname = children.nickname AND fm2.user_id = children.user_id)");
+                log.info("迁移322: 已从 children 插入不匹配记录到 family_members");
+
+                // 3. 删除 children 表
+                jdbcTemplate.execute("DROP TABLE IF EXISTS children");
+                log.info("迁移322: 已删除 children 表（数据已迁移到 family_members）");
+            }
+        } catch (Exception e) {
+            log.warn("迁移322执行失败（children 表可能不存在或迁移范围内字段缺失）: {}", e.getMessage());
+        }
+
+
         ensureColumn("promotion_tier", "rate_percent", "INT DEFAULT 0 COMMENT '当前返佣比例(%)'");
 
         // 迁移300: family_members 添加 status 列（成员状态: active/recycled，非微信用户被移出进回收箱）
@@ -10565,14 +10559,14 @@ sqls.add("INSERT IGNORE INTO health_norm_reference (dimension, gender, age_min,
 
         // ===== 生产库对账候选风险记录（已核对生产库，2026-09，按用户决定不迁移/暂不动，仅记录）=====
         // 注：以下为 entity 期望但生产库未对齐.项目，用户已决定保持现状或记为候选，勿重复迁移。
-        // 1. children 表缺 phone、id_card（Child 实体+ChildMapper 仍活跃，AccountCleanupService
+        
         //    exportUserData 全字段 SELECT 会报 Unknown column 'phone'）。schema.sql 已将 children 标为
         //    已废除/并入 family_members，用户决定不迁移。
         // 2. user_trigger_rules：生产表仅剩 user_id(PK,auto_increment)/action_config/last_triggered_at，
         //    实体期望 id/trigger_type/trigger_action/status/created_at 共 8 列，表 0 行且不在 schema.sql。
         //    UserSegmentationService.getTriggerRules 会查 status，命中时会报 Unknown column 'status'。候选。
         // 3. promotion_tier.rate_percent：生产用旧模型(tier/team_size_1st/2nd/3rd/total_*)，实体期望新模型，
-        //    表 0 行。已由迁移299补充 rate_percent 列（2026-09-06 定时任务崩溃修复，生产库已手动 ALTER 补列）。
+        
         // 4. promotion_tier_config：实体已废弃，改用 cf_rate_tier(迁移279)，保持现状。
         // 5. family_members.member_type：实体为 VO 计算值已加 @TableField(exist=false)（不落库），schema.sql
         //    无此列；2026-09-06 生产已手动 ALTER 补列（JwtInterceptor/SurveyServiceImpl 查询报 Unknown column
@@ -10956,7 +10950,6 @@ sqls.add("INSERT IGNORE INTO health_norm_reference (dimension, gender, age_min,
             // 表已存在，忽略
         }
 
-        // 迁移318: 创建 DOA 个人目标-周计划-周复盘三表（家庭打卡个人目标模块，2026-09-12）
         try {
             jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS doa_stage (" +
                     "id BIGINT AUTO_INCREMENT PRIMARY KEY, " +
@@ -11071,9 +11064,8 @@ sqls.add("INSERT IGNORE INTO health_norm_reference (dimension, gender, age_min,
             }
         } catch (Exception e) {
             log.warn("迁移319: 插入 health_plan 提示词种子数据失败: {}", e.getMessage());
-        }
+    }
 
-        // 迁移320: exercise_record 表添加 step_count 列（微信运动步数同步）
         try {
             jdbcTemplate.execute("ALTER TABLE exercise_record ADD COLUMN step_count INT COMMENT '微信运动步数'");
             log.info("迁移320: exercise_record.step_count 列已添加");

cfc-backend/src/main/java/com/etotem/cfc/entity/Child.java

@@ -1,63 +0,0 @@
-package com.etotem.cfc.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Deprecated children 表已废除，数据已合并到 family_members 表。
- * 保留实体类以兼容历史引用，新代码请使用 FamilyMember。
- */
-@Data
-@TableName("children")
-public class Child implements Serializable {
-
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    private Long userId;
-
-    private Long familyId;
-
-    private String nickname;
-
-    private Integer age;
-
-    private Date birthday; // 生日
-
-    private String gender; // 性别: male/female
-
-    private String phone; // 手机号（选填）
-
-    private String idCard; // 身份证号（选填）
-
-    private Integer penaltyEnabled;
-
-    private String theme;
-
-    private Integer totalPoints;
-
-    /** CF值（测评建档/平台发放，用于提现/优惠券兑换） */
-    private Integer systemPoints;
-
-    private Integer streakDays;
-
-    private Date lastTaskDate;
-
-    private Integer focusMaxDaily;
-
-    private Integer focusRemaining;
-
-    private Date focusResetDate;
-
-    // 是否对家庭成员可见: 1=可见, 0=不可见
-    private Integer showToFamily;
-
-    private Date createdAt;
-
-    private Date updatedAt;
-}

cfc-backend/src/main/java/com/etotem/cfc/mapper/ChildBadgeMapper.java

@@ -25,7 +25,7 @@ public interface ChildBadgeMapper extends BaseMapper<ChildBadge> {
     List<Map<String, Object>> selectLevelStats(@Param("childId") Long childId);
 
     @Select("SELECT cb.child_id, COUNT(*) as total FROM child_badge cb " +
-            "WHERE cb.child_id IN (SELECT id FROM children WHERE family_id = #{familyId}) " +
+            "WHERE cb.child_id IN (SELECT id FROM family_members WHERE family_id = #{familyId}) " +
             "AND cb.status = 1 GROUP BY cb.child_id ORDER BY total DESC")
     List<Map<String, Object>> selectFamilyRanking(@Param("familyId") Long familyId);
 }

cfc-backend/src/main/java/com/etotem/cfc/mapper/ChildMapper.java

@@ -1,12 +0,0 @@
-package com.etotem.cfc.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.etotem.cfc.entity.Child;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @deprecated children 表已废除，数据已合并到 family_members 表。新代码请使用 FamilyMemberMapper。
- */
-@Mapper
-public interface ChildMapper extends BaseMapper<Child> {
-}

cfc-backend/src/main/java/com/etotem/cfc/mapper/GameRecordMapper.java

@@ -17,8 +17,8 @@ public interface GameRecordMapper extends BaseMapper<GameRecord> {
             "FROM game_records WHERE child_id = #{childId} GROUP BY game_code")
     List<Map<String, Object>> selectBestScoresByChild(@Param("childId") Long childId);
 
-    @Select("SELECT gr.*, c.name as child_name " +
-            "FROM game_records gr LEFT JOIN children c ON gr.child_id = c.id " +
+    @Select("SELECT gr.*, fm.nickname as child_name " +
+            "FROM game_records gr LEFT JOIN family_members fm ON gr.child_id = fm.id " +
             "WHERE gr.game_code = #{gameCode} ORDER BY gr.score DESC LIMIT #{limit}")
     List<Map<String, Object>> selectLeaderboard(@Param("gameCode") String gameCode,
                                                  @Param("limit") int limit);

cfc-backend/src/main/java/com/etotem/cfc/service/AccountCleanupService.java

@@ -24,9 +24,6 @@ public class AccountCleanupService {
     @Resource
     private UserMapper userMapper;
 
-    @Resource
-    private ChildMapper childMapper;
-
     @Resource
     private DanAssessmentResultMapper danAssessmentResultMapper;
 

cfc-backend/src/main/java/com/etotem/cfc/service/DatabaseSyncService.java

@@ -34,7 +34,6 @@ public class DatabaseSyncService {
 
     static {
         ENTITY_TABLE_MAP.put(User.class, "users");
-        ENTITY_TABLE_MAP.put(Child.class, "children");
         ENTITY_TABLE_MAP.put(Family.class, "families");
         ENTITY_TABLE_MAP.put(Task.class, "tasks");
         ENTITY_TABLE_MAP.put(Reward.class, "rewards");

cfc-backend/src/main/java/com/etotem/cfc/service/GrowthTaskService.java

@@ -1,7 +1,7 @@
 package com.etotem.cfc.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.etotem.cfc.entity.Child;
+
 import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.entity.GrowthTask;
 import com.etotem.cfc.entity.GrowthTaskLog;

cfc-backend/src/main/java/com/etotem/cfc/service/TaskStatsService.java

@@ -1,7 +1,7 @@
 package com.etotem.cfc.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.etotem.cfc.entity.Child;
+
 import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.entity.Task;
 

cfc-backend/src/main/resources/schema.sql

@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS users (
 -- 不可登录成员（无 openid）= 家长手动创建的子账号。
 
 -- ============================================================
--- 【已废除】children 表已合并到 family_members
+-- 【已删除】children 表已废弃：数据由 DatabaseInitializer 迁移322 迁移至 family_members 后 DROP。
 -- 保留此处仅作参考，勿执行
 -- ============================================================
 -- CREATE TABLE IF NOT EXISTS children (
@@ -2525,20 +2525,13 @@ CREATE TABLE IF NOT EXISTS system_config (
 
 -- ============================================================
 -- 数据迁移: children → family_members + roleOverride 变更
--- 执行时机: Phase 9（所有代码变更完成后、上线前）
+-- 已由 DatabaseInitializer 迁移322 落地执行（幂等，自动 DROP children 表）
+-- 以下 SQL 仅为迁移逻辑存档，勿手动重复执行
 -- ============================================================
 
 -- 1. family_members.capability_role → role_override (已在 DDL 中 ALTER)
 -- 2. relationship_types.capability_role → default_role (已在 DDL 中 ALTER)
 
--- ============================================================
--- 数据迁移: children → family_members + roleOverride 变更
--- 执行时机: Phase 9（所有代码变更完成后、上线前）
--- ============================================================
-
--- 1. family_members 已包含所有必要字段（role_override, 孩子专属字段已在 DDL 中）
--- relationship_types.capability_role → default_role 已在 DDL 中 ALTER
-
 -- 2. 迁移 children 数据到 family_members（匹配更新：family_members 已存在该成员记录时更新）
 UPDATE family_members fm
 INNER JOIN children c ON fm.family_id = c.family_id AND fm.nickname = c.nickname AND fm.user_id = c.user_id
@@ -2582,7 +2575,7 @@ INSERT INTO system_config (config_key, config_value, description) VALUES
   ('elderly_age_threshold', '65', '老年年龄分界线（岁）')
 ON DUPLICATE KEY UPDATE config_value = VALUES(config_value);
 
--- 5. 删除 children 表（最后执行，确认迁移完成后再执行此步）
+-- 5. 删除 children 表（已由 DatabaseInitializer 迁移322 自动执行，勿手动重复）
 -- DROP TABLE IF EXISTS children;
 
 -- ============================================================