Jelajahi Sumber

merge: resolve conflicts and merge origin/cfclub

openhands 4 bulan lalu
induk
melakukan
29791d5c9c
100 mengubah file dengan 8938 tambahan dan 1801 penghapusan
  1. 123 2
      cfc-backend/src/main/java/com/etotem/cfc/config/DatabaseInitializer.java
  2. 9 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/ContactController.java
  3. 42 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/HealthExerciseController.java
  4. 42 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/HealthMealController.java
  5. 42 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/HealthMeditationController.java
  6. 42 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/HealthSleepController.java
  7. 42 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/HealthWaterController.java
  8. 54 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/NutritionistController.java
  9. 1 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/UserController.java
  10. 35 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminActivityController.java
  11. 62 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminCommissionConfigController.java
  12. 63 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminController.java
  13. 54 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminEarningsController.java
  14. 4 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminProductController.java
  15. 35 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminPromotionConfigController.java
  16. 74 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminSupplierController.java
  17. 0 52
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/EducationSystemController.java
  18. 101 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/ReviewCenterController.java
  19. 223 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplierProductController.java
  20. 20 23
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplyHierarchyController.java
  21. 3 3
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplySettlementController.java
  22. 29 12
      cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplySystemController.java
  23. 13 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/family/FamilyMembersController.java
  24. 78 0
      cfc-backend/src/main/java/com/etotem/cfc/controller/guide/GuideFamilyListController.java
  25. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/controller/product/ProductController.java
  26. 2 0
      cfc-backend/src/main/java/com/etotem/cfc/dto/ContactDTO.java
  27. 2 2
      cfc-backend/src/main/java/com/etotem/cfc/dto/ProductSkuDTO.java
  28. 3 0
      cfc-backend/src/main/java/com/etotem/cfc/dto/UpdateUserDTO.java
  29. 6 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/Contact.java
  30. 30 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/EcomSupplier.java
  31. 0 46
      cfc-backend/src/main/java/com/etotem/cfc/entity/EducationSystem.java
  32. 84 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/FamilyFortuneReport.java
  33. 22 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/FamilyMemberLog.java
  34. 0 14
      cfc-backend/src/main/java/com/etotem/cfc/entity/Guide.java
  35. 40 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/HealthMealRecord.java
  36. 30 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/HealthMeditationRecord.java
  37. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/entity/ProductSku.java
  38. 32 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/RebateCommissionConfig.java
  39. 9 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/RelationshipType.java
  40. 2 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/SupplySystem.java
  41. 6 0
      cfc-backend/src/main/java/com/etotem/cfc/entity/User.java
  42. 2 2
      cfc-backend/src/main/java/com/etotem/cfc/mapper/EcomSupplierMapper.java
  43. 9 0
      cfc-backend/src/main/java/com/etotem/cfc/mapper/FamilyFortuneReportMapper.java
  44. 9 0
      cfc-backend/src/main/java/com/etotem/cfc/mapper/FamilyMemberLogMapper.java
  45. 7 0
      cfc-backend/src/main/java/com/etotem/cfc/mapper/HealthMealRecordMapper.java
  46. 7 0
      cfc-backend/src/main/java/com/etotem/cfc/mapper/HealthMeditationRecordMapper.java
  47. 9 0
      cfc-backend/src/main/java/com/etotem/cfc/mapper/RebateCommissionConfigMapper.java
  48. 1 1
      cfc-backend/src/main/java/com/etotem/cfc/service/CartService.java
  49. 23 0
      cfc-backend/src/main/java/com/etotem/cfc/service/ContactService.java
  50. 0 33
      cfc-backend/src/main/java/com/etotem/cfc/service/EducationSystemService.java
  51. 45 0
      cfc-backend/src/main/java/com/etotem/cfc/service/FamilyMemberService.java
  52. 25 0
      cfc-backend/src/main/java/com/etotem/cfc/service/PdfReportService.java
  53. 4 0
      cfc-backend/src/main/java/com/etotem/cfc/service/ProductService.java
  54. 44 6
      cfc-backend/src/main/java/com/etotem/cfc/service/ProductSkuService.java
  55. 3 1
      cfc-backend/src/main/java/com/etotem/cfc/service/SupplyHierarchyService.java
  56. 4 4
      cfc-backend/src/main/java/com/etotem/cfc/service/SupplySettlementService.java
  57. 8 0
      cfc-backend/src/main/java/com/etotem/cfc/service/SupplySystemService.java
  58. 5 1
      cfc-backend/src/main/java/com/etotem/cfc/service/UserService.java
  59. 169 0
      cfc-backend/src/main/java/com/etotem/cfc/service/impl/PdfReportServiceImpl.java
  60. 3905 13
      cfc-backend/src/main/resources/schema.sql
  61. 200 0
      cfc-frontend/components/ContactCard.vue
  62. 167 157
      cfc-frontend/components/FamilyRelationGraph.vue
  63. 22 0
      cfc-frontend/pages.json
  64. 1 1
      cfc-frontend/pages/activity/create.vue
  65. 1 1
      cfc-frontend/pages/article-center/article-edit.vue
  66. 200 0
      cfc-frontend/pages/butler/apply/index.vue
  67. 1 1
      cfc-frontend/pages/discover/product-detail/product-detail.vue
  68. 1 1
      cfc-frontend/pages/guide/bind/invite.vue
  69. 2 1
      cfc-frontend/pages/login/login.vue
  70. 1 1
      cfc-frontend/pages/mind-detail/emotion-checkin.vue
  71. 1 1
      cfc-frontend/pages/mind/emotion-checkin.vue
  72. 153 0
      cfc-frontend/pages/nutritionist/apply/index.vue
  73. 564 15
      cfc-frontend/pages/promotion/index.vue
  74. 2 2
      cfc-frontend/pages/teacher/chat.vue
  75. 39 9
      cfc-frontend/pages/user-edit/user-edit.vue
  76. 341 173
      cfc-frontend/pages/wealth/index.vue
  77. 21 1
      cfc-frontend/utils/api.js
  78. 1 1
      cfc-web/.last_build_commit
  79. 2 2
      cfc-web/package-lock.json
  80. 1 1
      cfc-web/package.json
  81. 411 0
      cfc-web/public/CHANGELOG-v1.0.md
  82. 412 1
      cfc-web/public/CHANGELOG.md
  83. 117 41
      cfc-web/src/api/admin.js
  84. 0 127
      cfc-web/src/api/adminService.js
  85. 3 3
      cfc-web/src/api/growthTask.js
  86. 2 2
      cfc-web/src/api/guide.js
  87. 24 1
      cfc-web/src/api/package.js
  88. 23 40
      cfc-web/src/components/DimensionWeightPicker.vue
  89. 25 55
      cfc-web/src/router/index.js
  90. 2 2
      cfc-web/src/views/Dashboard.vue
  91. 0 225
      cfc-web/src/views/GuideAudit.vue
  92. 9 20
      cfc-web/src/views/Layout.vue
  93. 0 217
      cfc-web/src/views/PackageAudit.vue
  94. 110 26
      cfc-web/src/views/admin/Activities.vue
  95. 41 9
      cfc-web/src/views/admin/ActivityReview.vue
  96. 10 3
      cfc-web/src/views/admin/ArticleManage.vue
  97. 0 264
      cfc-web/src/views/admin/ButlerReview.vue
  98. 0 179
      cfc-web/src/views/admin/EducationSystems.vue
  99. 163 0
      cfc-web/src/views/admin/FamilyEarnings.vue
  100. 125 0
      cfc-web/src/views/admin/FamilyEarningsWithdraw.vue

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

@@ -3156,8 +3156,6 @@ log.info("已添加template_id列到tasks表");
         modifyColumnToText("supply_settlements", "remark", "备注");
         // content_sections.description
         modifyColumnToText("content_sections", "description", "描述说明");
-        // education_systems.description
-        modifyColumnToText("education_systems", "description", "描述");
         // dimension_config.description
         modifyColumnToText("dimension_config", "description", "描述");
         // energy_rules.description
@@ -5285,6 +5283,8 @@ try {
         runMigration86();
         runMigration88();
         runMigration89();
+        runMigration90();
+        runMigration91();
     }
 
     private void runMigration81() {
@@ -5402,6 +5402,9 @@ try {
         // 迁移88: activities表添加dimension_weights列(权重感知活动查询)
         ensureColumn("activities", "dimension_weights", "TEXT COMMENT '五维能量权重JSON'");
 
+        // 迁移89: products表添加dimension_weights列(权重感知商品查询)
+        ensureColumn("products", "dimension_weights", "TEXT COMMENT '五维能量权重JSON'");
+
         // 迁移85: 创建社交圈子表(珍珠图/圈子系统)
         try {
             jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS social_circle (" +
@@ -5427,6 +5430,11 @@ try {
                     ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='圈子成员'");
             log.info("已创建social_circle_member表");
         } catch (Exception e) { /* 表已存在忽略 */ }
+
+        // 迁移89: relationship_types表添加分类和血亲字段
+        ensureColumn("relationship_types", "category", "VARCHAR(50) DEFAULT 'social' COMMENT '关系分类: blood血亲/marriage姻亲/social社会关系'");
+        ensureColumn("relationship_types", "is_blood_relation", "TINYINT DEFAULT 0 COMMENT '是否血亲关系: 1是0否'");
+        ensureColumn("relationship_types", "is_immediate_family", "TINYINT DEFAULT 0 COMMENT '是否直系亲属: 1是0否'");
     }
 
     private void runMigration82() {
@@ -5670,6 +5678,105 @@ try {
 
         // commission_records 加 family_id 列
         ensureColumn("commission_records", "family_id", "BIGINT COMMENT '归属家庭 ID'");
+
+        // 迁移90: contacts表添加家庭成员关联字段(联系人→家庭成员升级路径)
+        ensureColumn("contacts", "family_member_id", "BIGINT DEFAULT NULL COMMENT '关联的家庭成员ID'");
+        ensureColumn("contacts", "invited_status", "VARCHAR(16) DEFAULT 'none' COMMENT '邀请加入家庭状态: none/invited/accepted/declined'");
+
+        // 迁移91: 创建family_member_logs表(家庭成员变更日志)
+        try {
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS family_member_logs (" +
+                    "id BIGINT AUTO_INCREMENT PRIMARY KEY, " +
+                    "family_id BIGINT NOT NULL COMMENT '家庭ID', " +
+                    "member_id BIGINT NOT NULL COMMENT '成员ID', " +
+                    "action VARCHAR(32) NOT NULL COMMENT '操作: join/leave/update/kick', " +
+                    "old_value VARCHAR(500) COMMENT '旧值', " +
+                    "new_value VARCHAR(500) COMMENT '新值', " +
+                    "operator_id BIGINT COMMENT '操作人用户ID', " +
+                    "created_at DATETIME DEFAULT CURRENT_TIMESTAMP, " +
+                    "INDEX idx_family_id (family_id), " +
+                    "INDEX idx_member_id (member_id)" +
+                    ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭成员变更日志'");
+            log.info("已创建family_member_logs表");
+        } catch (Exception e) {
+            // 表已存在,忽略错误
+        }
+
+        // 迁移92: 创建health_meal_record表(饮食打卡记录)
+        try {
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS health_meal_record (" +
+                    "id BIGINT AUTO_INCREMENT PRIMARY KEY, " +
+                    "member_id BIGINT NOT NULL COMMENT '家庭成员ID', " +
+                    "checkin_id BIGINT COMMENT '关联打卡ID', " +
+                    "meal_type VARCHAR(32) COMMENT '餐次: breakfast/lunch/dinner/snack', " +
+                    "food_items TEXT COMMENT '食物清单JSON', " +
+                    "total_calories INT COMMENT '总卡路里', " +
+                    "protein_g INT COMMENT '蛋白质克数', " +
+                    "fat_g INT COMMENT '脂肪克数', " +
+                    "carbs_g INT COMMENT '碳水克数', " +
+                    "fiber_g INT COMMENT '膳食纤维克数', " +
+                    "meal_time DATETIME COMMENT '用餐时间', " +
+                    "remark VARCHAR(500) COMMENT '备注', " +
+                    "created_at DATETIME DEFAULT CURRENT_TIMESTAMP, " +
+                    "INDEX idx_member_id (member_id)" +
+                    ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='饮食打卡记录'");
+            log.info("已创建health_meal_record表");
+        } catch (Exception e) {
+            // 表已存在,忽略错误
+        }
+
+        // 迁移93: 创建health_meditation_record表(冥想打卡记录)
+        try {
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS health_meditation_record (" +
+                    "id BIGINT AUTO_INCREMENT PRIMARY KEY, " +
+                    "member_id BIGINT NOT NULL COMMENT '家庭成员ID', " +
+                    "checkin_id BIGINT COMMENT '关联打卡ID', " +
+                    "duration_minutes INT COMMENT '时长(分钟)', " +
+                    "type VARCHAR(32) COMMENT '类型: mindfulness/guided/breathing/body_scan', " +
+                    "mood VARCHAR(32) COMMENT '冥想后心情', " +
+                    "remark VARCHAR(500) COMMENT '备注', " +
+                    "created_at DATETIME DEFAULT CURRENT_TIMESTAMP, " +
+                    "INDEX idx_member_id (member_id)" +
+                    ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='冥想打卡记录'");
+            log.info("已创建health_meditation_record表");
+        } catch (Exception e) {
+            // 表已存在,忽略错误
+        }
+
+        // 迁移94: 创建ecom_supplier表(电商供应商管理)
+        try {
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS ecom_supplier (" +
+                    "id BIGINT AUTO_INCREMENT PRIMARY KEY, " +
+                    "name VARCHAR(100) NOT NULL COMMENT '供应商名称', " +
+                    "contact_name VARCHAR(50) COMMENT '联系人', " +
+                    "contact_phone VARCHAR(20) COMMENT '联系电话', " +
+                    "status TINYINT DEFAULT 1 COMMENT '启用状态 1启用 0禁用', " +
+                    "remark VARCHAR(500) COMMENT '备注', " +
+                    "created_at DATETIME DEFAULT CURRENT_TIMESTAMP, " +
+                    "updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" +
+                    ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='电商供应商'");
+            log.info("已创建ecom_supplier表");
+        } catch (Exception e) {
+            // 表已存在,忽略错误
+        }
+
+        // 迁移95: 创建rebate_commission_config表(佣金返利配置)
+        try {
+            jdbcTemplate.execute("CREATE TABLE IF NOT EXISTS rebate_commission_config (" +
+                    "id BIGINT AUTO_INCREMENT PRIMARY KEY, " +
+                    "name VARCHAR(100) NOT NULL COMMENT '配置名称', " +
+                    "rate INT COMMENT '佣金比例(万分比)', " +
+                    "rate_type TINYINT DEFAULT 1 COMMENT '比例类型 1百分比 2固定金额', " +
+                    "min_amount INT COMMENT '最低金额(分)', " +
+                    "max_amount INT COMMENT '最高金额(分)', " +
+                    "remark VARCHAR(500) COMMENT '备注', " +
+                    "created_at DATETIME DEFAULT CURRENT_TIMESTAMP, " +
+                    "updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" +
+                    ") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='佣金返利配置'");
+            log.info("已创建rebate_commission_config表");
+        } catch (Exception e) {
+            // 表已存在,忽略错误
+        }
     }
 
     private void runMigration89() {
@@ -5677,4 +5784,18 @@ try {
         ensureColumn("supply_system", "models", "TEXT COMMENT 'AI模型列表JSON,如[\"agnes-image-2.0-flash\",\"agnes-2.5-flash\"]'");
         log.info("已添加models列到supply_system表");
     }
+
+    private void runMigration90() {
+        // 迁移 90: supply_system表添加api_endpoint和api_key字段
+        ensureColumn("supply_system", "api_endpoint", "VARCHAR(512) COMMENT 'API端点'");
+        ensureColumn("supply_system", "api_key", "VARCHAR(256) COMMENT 'API密钥'");
+        log.info("已添加api_endpoint和api_key列到supply_system表");
+    }
+
+    private void runMigration91() {
+        // 迁移 91: users表添加营养师审核字段
+        ensureColumn("users", "nutritionist_status", "VARCHAR(20) DEFAULT NULL COMMENT '营养师审核状态: pending/approved/rejected'");
+        ensureColumn("users", "nutritionist_reject_reason", "VARCHAR(500) DEFAULT NULL COMMENT '营养师审核拒绝原因'");
+        log.info("已添加nutritionist_status和nutritionist_reject_reason列到users表");
+    }
 }

+ 9 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/ContactController.java

@@ -63,4 +63,13 @@ public class ContactController {
         Long id = Long.valueOf(params.get("id").toString());
         return contactService.recordInteraction(id, userId);
     }
+
+    @PostMapping("/invite-to-family")
+    public Result<Map<String, Object>> inviteToFamily(@RequestBody Map<String, Object> params,
+                                                     @RequestAttribute("userId") Long userId) {
+        Long contactId = Long.valueOf(params.get("contactId").toString());
+        String relationshipType = (String) params.get("relationshipType");
+        String generationLevel = (String) params.get("generationLevel");
+        return contactService.inviteToFamily(contactId, relationshipType, generationLevel, userId);
+    }
 }

+ 42 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/HealthExerciseController.java

@@ -0,0 +1,42 @@
+package com.etotem.cfc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.HealthExerciseRecord;
+import com.etotem.cfc.mapper.HealthExerciseRecordMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Tag(name = "运动打卡")
+@RestController
+@RequestMapping("/api/health/exercise")
+public class HealthExerciseController {
+
+    @Resource
+    private HealthExerciseRecordMapper healthExerciseRecordMapper;
+
+    @Operation(summary = "获取运动打卡列表")
+    @PostMapping("/list")
+    public Result<List<HealthExerciseRecord>> list(@RequestBody Map<String, Object> params) {
+        Long memberId = params.get("memberId") != null ? Long.valueOf(params.get("memberId").toString()) : null;
+        if (memberId == null) return Result.error("memberId不能为空");
+        LambdaQueryWrapper<HealthExerciseRecord> wrapper = new LambdaQueryWrapper<HealthExerciseRecord>()
+                .eq(HealthExerciseRecord::getMemberId, memberId)
+                .orderByDesc(HealthExerciseRecord::getCreatedAt);
+        return Result.success(healthExerciseRecordMapper.selectList(wrapper));
+    }
+
+    @Operation(summary = "创建运动打卡")
+    @PostMapping("/create")
+    public Result<HealthExerciseRecord> create(@RequestBody HealthExerciseRecord record) {
+        record.setCreatedAt(new Date());
+        healthExerciseRecordMapper.insert(record);
+        return Result.success(record);
+    }
+}

+ 42 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/HealthMealController.java

@@ -0,0 +1,42 @@
+package com.etotem.cfc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.HealthMealRecord;
+import com.etotem.cfc.mapper.HealthMealRecordMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Tag(name = "饮食打卡")
+@RestController
+@RequestMapping("/api/health/meal")
+public class HealthMealController {
+
+    @Resource
+    private HealthMealRecordMapper healthMealRecordMapper;
+
+    @Operation(summary = "获取饮食打卡列表")
+    @PostMapping("/list")
+    public Result<List<HealthMealRecord>> list(@RequestBody Map<String, Object> params) {
+        Long memberId = params.get("memberId") != null ? Long.valueOf(params.get("memberId").toString()) : null;
+        if (memberId == null) return Result.error("memberId不能为空");
+        LambdaQueryWrapper<HealthMealRecord> wrapper = new LambdaQueryWrapper<HealthMealRecord>()
+                .eq(HealthMealRecord::getMemberId, memberId)
+                .orderByDesc(HealthMealRecord::getCreatedAt);
+        return Result.success(healthMealRecordMapper.selectList(wrapper));
+    }
+
+    @Operation(summary = "创建饮食打卡")
+    @PostMapping("/create")
+    public Result<HealthMealRecord> create(@RequestBody HealthMealRecord record) {
+        record.setCreatedAt(new Date());
+        healthMealRecordMapper.insert(record);
+        return Result.success(record);
+    }
+}

+ 42 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/HealthMeditationController.java

@@ -0,0 +1,42 @@
+package com.etotem.cfc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.HealthMeditationRecord;
+import com.etotem.cfc.mapper.HealthMeditationRecordMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Tag(name = "冥想打卡")
+@RestController
+@RequestMapping("/api/health/meditation")
+public class HealthMeditationController {
+
+    @Resource
+    private HealthMeditationRecordMapper healthMeditationRecordMapper;
+
+    @Operation(summary = "获取冥想打卡列表")
+    @PostMapping("/list")
+    public Result<List<HealthMeditationRecord>> list(@RequestBody Map<String, Object> params) {
+        Long memberId = params.get("memberId") != null ? Long.valueOf(params.get("memberId").toString()) : null;
+        if (memberId == null) return Result.error("memberId不能为空");
+        LambdaQueryWrapper<HealthMeditationRecord> wrapper = new LambdaQueryWrapper<HealthMeditationRecord>()
+                .eq(HealthMeditationRecord::getMemberId, memberId)
+                .orderByDesc(HealthMeditationRecord::getCreatedAt);
+        return Result.success(healthMeditationRecordMapper.selectList(wrapper));
+    }
+
+    @Operation(summary = "创建冥想打卡")
+    @PostMapping("/create")
+    public Result<HealthMeditationRecord> create(@RequestBody HealthMeditationRecord record) {
+        record.setCreatedAt(new Date());
+        healthMeditationRecordMapper.insert(record);
+        return Result.success(record);
+    }
+}

+ 42 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/HealthSleepController.java

@@ -0,0 +1,42 @@
+package com.etotem.cfc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.HealthSleepRecord;
+import com.etotem.cfc.mapper.HealthSleepRecordMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Tag(name = "睡眠打卡")
+@RestController
+@RequestMapping("/api/health/sleep")
+public class HealthSleepController {
+
+    @Resource
+    private HealthSleepRecordMapper healthSleepRecordMapper;
+
+    @Operation(summary = "获取睡眠打卡列表")
+    @PostMapping("/list")
+    public Result<List<HealthSleepRecord>> list(@RequestBody Map<String, Object> params) {
+        Long memberId = params.get("memberId") != null ? Long.valueOf(params.get("memberId").toString()) : null;
+        if (memberId == null) return Result.error("memberId不能为空");
+        LambdaQueryWrapper<HealthSleepRecord> wrapper = new LambdaQueryWrapper<HealthSleepRecord>()
+                .eq(HealthSleepRecord::getMemberId, memberId)
+                .orderByDesc(HealthSleepRecord::getCreatedAt);
+        return Result.success(healthSleepRecordMapper.selectList(wrapper));
+    }
+
+    @Operation(summary = "创建睡眠打卡")
+    @PostMapping("/create")
+    public Result<HealthSleepRecord> create(@RequestBody HealthSleepRecord record) {
+        record.setCreatedAt(new Date());
+        healthSleepRecordMapper.insert(record);
+        return Result.success(record);
+    }
+}

+ 42 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/HealthWaterController.java

@@ -0,0 +1,42 @@
+package com.etotem.cfc.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.HealthWaterRecord;
+import com.etotem.cfc.mapper.HealthWaterRecordMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Tag(name = "喝水打卡")
+@RestController
+@RequestMapping("/api/health/water")
+public class HealthWaterController {
+
+    @Resource
+    private HealthWaterRecordMapper healthWaterRecordMapper;
+
+    @Operation(summary = "获取喝水打卡列表")
+    @PostMapping("/list")
+    public Result<List<HealthWaterRecord>> list(@RequestBody Map<String, Object> params) {
+        Long memberId = params.get("memberId") != null ? Long.valueOf(params.get("memberId").toString()) : null;
+        if (memberId == null) return Result.error("memberId不能为空");
+        LambdaQueryWrapper<HealthWaterRecord> wrapper = new LambdaQueryWrapper<HealthWaterRecord>()
+                .eq(HealthWaterRecord::getMemberId, memberId)
+                .orderByDesc(HealthWaterRecord::getCreatedAt);
+        return Result.success(healthWaterRecordMapper.selectList(wrapper));
+    }
+
+    @Operation(summary = "创建喝水打卡")
+    @PostMapping("/create")
+    public Result<HealthWaterRecord> create(@RequestBody HealthWaterRecord record) {
+        record.setCreatedAt(new Date());
+        healthWaterRecordMapper.insert(record);
+        return Result.success(record);
+    }
+}

+ 54 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/NutritionistController.java

@@ -0,0 +1,54 @@
+package com.etotem.cfc.controller;
+
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.User;
+import com.etotem.cfc.mapper.UserMapper;
+import com.etotem.cfc.service.UserService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.Map;
+
+@RestController("nutritionistController")
+@RequestMapping("/api/nutritionist")
+public class NutritionistController {
+
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private UserService userService;
+
+    @PostMapping("/apply")
+    public Result<String> apply(@RequestBody Map<String, Object> params,
+                                 @RequestAttribute("userId") Long userId) {
+        User user = userMapper.selectById(userId);
+        if (user == null) {
+            return Result.error("用户不存在");
+        }
+        if (user.getNutritionistStatus() != null && !"rejected".equals(user.getNutritionistStatus())) {
+            return Result.error("已有营养师申请,请勿重复提交");
+        }
+        user.setNutritionistStatus("pending");
+        user.setNutritionistRejectReason(null);
+        user.setUpdatedAt(new Date());
+        userMapper.updateById(user);
+
+        userService.addRole(user.getId(), "nutritionist");
+
+        return Result.success("营养师申请已提交,请等待审核");
+    }
+
+    @PostMapping("/status")
+    public Result<Map<String, Object>> getStatus(@RequestAttribute("userId") Long userId) {
+        User user = userMapper.selectById(userId);
+        if (user == null) {
+            return Result.error("用户不存在");
+        }
+        java.util.Map<String, Object> data = new java.util.HashMap<>();
+        data.put("nutritionistStatus", user.getNutritionistStatus());
+        data.put("nutritionistRejectReason", user.getNutritionistRejectReason());
+        return Result.success(data);
+    }
+}

+ 1 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/UserController.java

@@ -95,6 +95,7 @@ public class UserController {
         if (params.containsKey("mascot")) dto.setMascot((String) params.get("mascot"));
         if (params.containsKey("hobbies")) dto.setHobbies((String) params.get("hobbies"));
         if (params.containsKey("dietPreferences")) dto.setDietPreferences((String) params.get("dietPreferences"));
+        if (params.containsKey("address")) dto.setAddress((String) params.get("address"));
 
         boolean success = userService.updateUserInfo(userId, dto);
         if (success) {

+ 35 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminActivityController.java

@@ -49,4 +49,39 @@ public class AdminActivityController {
         if (activity == null) return Result.error("活动不存在");
         return Result.success(activity);
     }
+
+    @PostMapping("/submit-review")
+    public Result<String> submitReview(@RequestBody Map<String, Object> params) {
+        Long id = params.get("id") != null ? Long.valueOf(params.get("id").toString()) : null;
+        if (id == null) return Result.error("id不能为空");
+        activityAdminService.submitForReview(id);
+        return Result.success("已提交审核");
+    }
+
+    @PostMapping("/audit")
+    public Result<String> audit(@RequestBody Map<String, Object> params,
+                                @RequestAttribute("userId") Long adminId) {
+        Long id = params.get("id") != null ? Long.valueOf(params.get("id").toString()) : null;
+        String action = (String) params.get("action");
+        String rejectReason = (String) params.get("rejectReason");
+        if (id == null || action == null) return Result.error("id和action不能为空");
+        activityAdminService.auditActivity(id, action, rejectReason, adminId);
+        return Result.success("已审核");
+    }
+
+    @PostMapping("/withdraw")
+    public Result<String> withdraw(@RequestBody Map<String, Object> params) {
+        Long id = params.get("id") != null ? Long.valueOf(params.get("id").toString()) : null;
+        if (id == null) return Result.error("id不能为空");
+        activityAdminService.withdraw(id);
+        return Result.success("已撤回");
+    }
+
+    @PostMapping("/re-draft")
+    public Result<String> reDraft(@RequestBody Map<String, Object> params) {
+        Long id = params.get("id") != null ? Long.valueOf(params.get("id").toString()) : null;
+        if (id == null) return Result.error("id不能为空");
+        activityAdminService.reDraft(id);
+        return Result.success("已转为草稿");
+    }
 }

+ 62 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminCommissionConfigController.java

@@ -0,0 +1,62 @@
+package com.etotem.cfc.controller.admin;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.RebateCommissionConfig;
+import com.etotem.cfc.mapper.RebateCommissionConfigMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Tag(name = "管理端-佣金配置")
+@RestController
+@RequestMapping("/api/admin/commission")
+public class AdminCommissionConfigController {
+
+    @Resource
+    private RebateCommissionConfigMapper rebateCommissionConfigMapper;
+
+    @Operation(summary = "佣金配置列表")
+    @PostMapping("/config")
+    public Result<List<RebateCommissionConfig>> getConfig() {
+        List<RebateCommissionConfig> list = rebateCommissionConfigMapper.selectList(null);
+        return Result.success(list);
+    }
+
+    @Operation(summary = "更新佣金配置")
+    @PostMapping("/config/update")
+    public Result<String> updateConfig(@RequestBody RebateCommissionConfig config) {
+        if (config.getId() != null) {
+            config.setUpdatedAt(new Date());
+            rebateCommissionConfigMapper.updateById(config);
+        } else {
+            config.setCreatedAt(new Date());
+            config.setUpdatedAt(new Date());
+            rebateCommissionConfigMapper.insert(config);
+        }
+        return Result.success("ok");
+    }
+
+    @Operation(summary = "佣金记录查询")
+    @PostMapping("/records")
+    public Result<List<RebateCommissionConfig>> records() {
+        return Result.success(rebateCommissionConfigMapper.selectList(null));
+    }
+
+    @Operation(summary = "手动结算")
+    @PostMapping("/settle")
+    public Result<String> settle(@RequestBody Map<String, Object> params) {
+        return Result.success("结算任务已提交");
+    }
+
+    @Operation(summary = "佣金退款")
+    @PostMapping("/refund")
+    public Result<String> refund(@RequestBody Map<String, Object> params) {
+        return Result.success("退款已处理");
+    }
+}

+ 63 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminController.java

@@ -613,8 +613,9 @@ public class AdminController {
                 .eq(Admin::getPhone, user.getPhone()));
         if (admin == null) {
             admin = new Admin();
+            String usernameVal = user.getPhone() != null ? user.getPhone() : ("teacher_" + user.getId());
             admin.setPhone(user.getPhone());
-            admin.setUsername(user.getPhone());
+            admin.setUsername(usernameVal);
             admin.setRealName(user.getRealName());
             admin.setNickname(user.getNickname());
             admin.setRole("teacher");
@@ -678,6 +679,67 @@ public class AdminController {
         return Result.success(result);
     }
 
+    // ========== 营养师审核相关接口 ==========
+
+    @Operation(summary = "获取营养师审核列表")
+    @PostMapping("/nutritionist/applications")
+    public Result<Page<User>> getNutritionistApplications(@RequestBody Map<String, Object> params) {
+        String status = params.get("status") != null ? (String) params.get("status") : "pending";
+        int page = params.get("page") != null ? ((Number) params.get("page")).intValue() : 1;
+        int size = params.get("size") != null ? ((Number) params.get("size")).intValue() : 10;
+
+        Page<User> pageParam = new Page<>(page, size);
+        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<User>()
+            .eq(User::getNutritionistStatus, status)
+            .isNotNull(User::getRealName)
+            .orderByDesc(User::getUpdatedAt);
+
+        Page<User> result = userMapper.selectPage(pageParam, wrapper);
+        return Result.success(result);
+    }
+
+    @Operation(summary = "通过营养师审核")
+    @PostMapping("/nutritionist/approve/{userId}")
+    public Result<Boolean> approveNutritionist(@PathVariable Long userId) {
+        User user = userMapper.selectById(userId);
+        if (user == null) {
+            return Result.error("用户不存在");
+        }
+
+        user.setNutritionistStatus("approved");
+        user.setUpdatedAt(new Date());
+        userMapper.updateById(user);
+
+        return Result.success(true);
+    }
+
+    @Operation(summary = "拒绝营养师审核")
+    @PostMapping("/nutritionist/reject/{userId}")
+    public Result<Boolean> rejectNutritionist(@PathVariable Long userId, @RequestBody Map<String, String> params) {
+        User user = userMapper.selectById(userId);
+        if (user == null) {
+            return Result.error("用户不存在");
+        }
+
+        user.setNutritionistStatus("rejected");
+        user.setNutritionistRejectReason(params.get("reason"));
+        user.setUpdatedAt(new Date());
+        userMapper.updateById(user);
+
+        return Result.success(true);
+    }
+
+    @Operation(summary = "获取待审核营养师数量")
+    @PostMapping("/nutritionist/pending-count")
+    public Result<Map<String, Object>> getPendingNutritionistCount() {
+        Long count = userMapper.selectCount(new LambdaQueryWrapper<User>()
+            .eq(User::getNutritionistStatus, "pending")
+            .isNotNull(User::getRealName));
+        Map<String, Object> result = new HashMap<>();
+        result.put("count", count);
+        return Result.success(result);
+    }
+
     // ========== 成长规划师相关接口 ==========
 
     /**

+ 54 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminEarningsController.java

@@ -0,0 +1,54 @@
+package com.etotem.cfc.controller.admin;
+
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.dto.FamilyEarningsSummaryDTO;
+import com.etotem.cfc.entity.FamilyEarnings;
+import com.etotem.cfc.entity.FamilyEarningsRecord;
+import com.etotem.cfc.mapper.FamilyEarningsMapper;
+import com.etotem.cfc.mapper.FamilyEarningsRecordMapper;
+import com.etotem.cfc.service.FamilyEarningsService;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/admin/earnings")
+public class AdminEarningsController {
+
+    @Resource
+    private FamilyEarningsService familyEarningsService;
+
+    @Resource
+    private FamilyEarningsMapper familyEarningsMapper;
+
+    @Resource
+    private FamilyEarningsRecordMapper familyEarningsRecordMapper;
+
+    @PostMapping("/families")
+    public Result<List<FamilyEarnings>> listFamilies(@RequestBody Map<String, Object> params) {
+        int page = params.get("page") != null ? ((Number) params.get("page")).intValue() : 1;
+        int size = params.get("size") != null ? ((Number) params.get("size")).intValue() : 20;
+        List<FamilyEarnings> list = familyEarningsMapper.selectList(null);
+        return Result.success(list);
+    }
+
+    @PostMapping("/family/{familyId}/summary")
+    public Result<FamilyEarningsSummaryDTO> familySummary(@PathVariable Long familyId) {
+        if (familyId == null) {
+            return Result.error("familyId不能为空");
+        }
+        return Result.success(familyEarningsService.getFamilySummary(familyId));
+    }
+
+    @PostMapping("/family/{familyId}/records")
+    public Result<List<FamilyEarningsRecord>> familyRecords(@PathVariable Long familyId, @RequestBody Map<String, Object> params) {
+        String type = (String) params.get("type");
+        return Result.success(familyEarningsService.getRecords(familyId, type));
+    }
+}

+ 4 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminProductController.java

@@ -50,6 +50,10 @@ public class AdminProductController {
         if (keyword != null && !keyword.isEmpty()) {
             wrapper.like(Product::getName, keyword);
         }
+        if (params.get("distributionSystemId") != null) {
+            wrapper.eq(Product::getDistributionSystemId,
+                    Long.valueOf(params.get("distributionSystemId").toString()));
+        }
 
         Page<Product> result = productService.adminProductList(pageParam, wrapper);
         List<ProductDTO> records = result.getRecords().stream()

+ 35 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminPromotionConfigController.java

@@ -0,0 +1,35 @@
+package com.etotem.cfc.controller.admin;
+
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.service.SysConfigService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@Tag(name = "管理端-推广配置")
+@RestController
+@RequestMapping("/api/admin/promotion")
+public class AdminPromotionConfigController {
+
+    private static final String CONFIG_KEY = "promotion_config";
+
+    @Resource
+    private SysConfigService sysConfigService;
+
+    @Operation(summary = "获取推广配置")
+    @PostMapping("/config")
+    public Result<String> getConfig() {
+        String value = sysConfigService.getValue(CONFIG_KEY);
+        return Result.success(value != null ? value : "{}");
+    }
+
+    @Operation(summary = "更新推广配置")
+    @PostMapping("/config/update")
+    public Result<String> updateConfig(@RequestBody Map<String, Object> params) {
+        String configValue = params.get("configValue") != null ? params.get("configValue").toString() : "{}";
+        return sysConfigService.update(CONFIG_KEY, configValue);
+    }
+}

+ 74 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminSupplierController.java

@@ -0,0 +1,74 @@
+package com.etotem.cfc.controller.admin;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.EcomSupplier;
+import com.etotem.cfc.mapper.EcomSupplierMapper;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Tag(name = "管理端-电商供应商管理")
+@RestController
+@RequestMapping("/api/admin/supplier")
+public class AdminSupplierController {
+
+    @Resource
+    private EcomSupplierMapper ecomSupplierMapper;
+
+    @Operation(summary = "供应商列表")
+    @PostMapping("/list")
+    public Result<Map<String, Object>> list(@RequestBody Map<String, Object> params) {
+        int page = params.get("page") != null ? ((Number) params.get("page")).intValue() : 1;
+        int size = params.get("size") != null ? ((Number) params.get("size")).intValue() : 20;
+        String keyword = (String) params.get("keyword");
+
+        Page<EcomSupplier> pageParam = new Page<>(page, size);
+        LambdaQueryWrapper<EcomSupplier> wrapper = new LambdaQueryWrapper<>();
+        if (keyword != null && !keyword.isEmpty()) {
+            wrapper.like(EcomSupplier::getName, keyword);
+        }
+        wrapper.orderByDesc(EcomSupplier::getCreatedAt);
+        Page<EcomSupplier> result = ecomSupplierMapper.selectPage(pageParam, wrapper);
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("records", result.getRecords());
+        data.put("total", result.getTotal());
+        data.put("page", page);
+        data.put("size", size);
+        return Result.success(data);
+    }
+
+    @Operation(summary = "新增供应商")
+    @PostMapping("/save")
+    public Result<EcomSupplier> save(@RequestBody EcomSupplier supplier) {
+        supplier.setCreatedAt(new Date());
+        supplier.setUpdatedAt(new Date());
+        ecomSupplierMapper.insert(supplier);
+        return Result.success(supplier);
+    }
+
+    @Operation(summary = "更新供应商")
+    @PostMapping("/update")
+    public Result<String> update(@RequestBody EcomSupplier supplier) {
+        if (supplier.getId() == null) return Result.error("id不能为空");
+        supplier.setUpdatedAt(new Date());
+        ecomSupplierMapper.updateById(supplier);
+        return Result.success("ok");
+    }
+
+    @Operation(summary = "删除供应商")
+    @PostMapping("/delete")
+    public Result<String> delete(@RequestBody Map<String, Object> params) {
+        Long id = params.get("id") != null ? Long.valueOf(params.get("id").toString()) : null;
+        if (id == null) return Result.error("id不能为空");
+        ecomSupplierMapper.deleteById(id);
+        return Result.success("ok");
+    }
+}

+ 0 - 52
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/EducationSystemController.java

@@ -1,52 +0,0 @@
-package com.etotem.cfc.controller.admin;
-
-import com.etotem.cfc.common.Result;
-import com.etotem.cfc.entity.EducationSystem;
-import com.etotem.cfc.service.EducationSystemService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-@RestController
-@RequestMapping("/api/admin/education-systems")
-public class EducationSystemController {
-
-    @Resource
-    private EducationSystemService educationSystemService;
-
-    @PostMapping("/list")
-    public Result<List<EducationSystem>> list() {
-        List<EducationSystem> list = educationSystemService.getActiveSystems();
-        return Result.success(list);
-    }
-
-    @PostMapping("/all")
-    public Result<List<EducationSystem>> listAll() {
-        List<EducationSystem> list = educationSystemService.list();
-        return Result.success(list);
-    }
-
-    @PostMapping("/create")
-    public Result<EducationSystem> create(@RequestBody EducationSystem system) {
-        system.setStatus("ACTIVE");
-        system.setCreatedAt(new Date());
-        system.setUpdatedAt(new Date());
-        EducationSystem created = educationSystemService.createSystem(system);
-        return Result.success(created);
-    }
-
-    @PostMapping("/update")
-    public Result<EducationSystem> update(@RequestBody EducationSystem system) {
-        system.setUpdatedAt(new Date());
-        boolean success = educationSystemService.updateSystem(system);
-        return success ? Result.success(system) : Result.error("更新失败");
-    }
-
-    @PostMapping("/delete")
-    public Result<Void> delete(@RequestParam Long id) {
-        boolean success = educationSystemService.deleteSystem(id);
-        return success ? Result.success(null) : Result.error("删除失败");
-    }
-}

+ 101 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/ReviewCenterController.java

@@ -0,0 +1,101 @@
+package com.etotem.cfc.controller.admin;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.Activity;
+import com.etotem.cfc.entity.ActivityRegistration;
+import com.etotem.cfc.entity.Article;
+import com.etotem.cfc.entity.ButlerProfile;
+import com.etotem.cfc.entity.Product;
+import com.etotem.cfc.entity.SupplyHierarchyChangeRequest;
+import com.etotem.cfc.entity.TaskTemplatePackage;
+import com.etotem.cfc.entity.User;
+import com.etotem.cfc.entity.WithdrawalRequest;
+import com.etotem.cfc.mapper.ActivityMapper;
+import com.etotem.cfc.mapper.ActivityRegistrationMapper;
+import com.etotem.cfc.mapper.ArticleMapper;
+import com.etotem.cfc.mapper.ButlerProfileMapper;
+import com.etotem.cfc.mapper.ProductMapper;
+import com.etotem.cfc.mapper.SupplyHierarchyChangeRequestMapper;
+import com.etotem.cfc.mapper.TaskTemplatePackageMapper;
+import com.etotem.cfc.mapper.UserMapper;
+import com.etotem.cfc.mapper.WithdrawalRequestMapper;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/admin/review-center")
+public class ReviewCenterController {
+
+    @Resource
+    private ArticleMapper articleMapper;
+
+    @Resource
+    private ProductMapper productMapper;
+
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private ActivityMapper activityMapper;
+
+    @Resource
+    private ActivityRegistrationMapper activityRegistrationMapper;
+
+    @Resource
+    private WithdrawalRequestMapper withdrawalRequestMapper;
+
+    @Resource
+    private TaskTemplatePackageMapper taskTemplatePackageMapper;
+
+    @Resource
+    private ButlerProfileMapper butlerProfileMapper;
+
+    @Resource
+    private SupplyHierarchyChangeRequestMapper supplyHierarchyChangeRequestMapper;
+
+    @PostMapping("/summary")
+    public Result<Map<String, Integer>> summary() {
+        Map<String, Integer> counts = new HashMap<>();
+
+        counts.put("articlePending", articleMapper.selectCount(
+                new QueryWrapper<Article>().eq("audit_status", "pending")).intValue());
+
+        counts.put("productPending", productMapper.selectCount(
+                new QueryWrapper<Product>().eq("status", "pending")).intValue());
+
+        counts.put("guidePending", userMapper.selectCount(
+                new QueryWrapper<User>().eq("teacher_status", "pending")).intValue());
+
+        counts.put("vendorPending", userMapper.selectCount(
+                new QueryWrapper<User>().eq("vendor_status", "pending")).intValue());
+
+        counts.put("butlerPending", butlerProfileMapper.selectCount(
+                new QueryWrapper<ButlerProfile>().eq("status", "pending")).intValue());
+
+        counts.put("packagePending", taskTemplatePackageMapper.selectCount(
+                new QueryWrapper<TaskTemplatePackage>().eq("status", "pending")).intValue());
+
+        counts.put("activityPending", activityMapper.selectCount(
+                new QueryWrapper<Activity>().eq("audit_status", "pending")).intValue());
+
+        counts.put("activityRegistrationPending", activityRegistrationMapper.selectCount(
+                new QueryWrapper<ActivityRegistration>().eq("status", "pending")).intValue());
+
+        counts.put("withdrawPending", withdrawalRequestMapper.selectCount(
+                new QueryWrapper<WithdrawalRequest>().eq("status", "pending")).intValue());
+
+        counts.put("hierarchyChangePending", supplyHierarchyChangeRequestMapper.selectCount(
+                new QueryWrapper<SupplyHierarchyChangeRequest>().eq("status", "pending")).intValue());
+
+        counts.put("nutritionistPending", userMapper.selectCount(
+                new QueryWrapper<User>().eq("nutritionist_status", "pending")).intValue());
+
+        return Result.success(counts);
+    }
+}

+ 223 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplierProductController.java

@@ -0,0 +1,223 @@
+package com.etotem.cfc.controller.admin;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.dto.ProductCreateRequest;
+import com.etotem.cfc.dto.ProductDTO;
+import com.etotem.cfc.entity.Product;
+import com.etotem.cfc.entity.SupplySystem;
+import com.etotem.cfc.service.ProductService;
+import com.etotem.cfc.service.SupplySystemService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 供应商管理员 - 商品管理控制器
+ * 供应商管理员只能管理自己体系内的商品
+ */
+@Tag(name = "供应商-商品管理")
+@RestController
+@RequestMapping("/api/admin/supplier/product")
+public class SupplierProductController {
+
+    @Resource
+    private SupplySystemService supplySystemService;
+
+    @Resource
+    private ProductService productService;
+
+    /**
+     * 获取当前供应商管理员所属的供应体系
+     */
+    private SupplySystem getMySystem(Long userId) {
+        return supplySystemService.getByAdminId(userId);
+    }
+
+    @Operation(summary = "供应商商品列表")
+    @PostMapping("/list")
+    public Result<Map<String, Object>> list(@RequestBody Map<String, Object> params,
+                                            @RequestAttribute("userId") Long adminId) {
+        SupplySystem system = getMySystem(adminId);
+        if (system == null) {
+            return Result.error("您没有关联的供应商体系");
+        }
+
+        String status = (String) params.get("status");
+        String keyword = (String) params.get("keyword");
+        Integer page = params.get("page") != null ? ((Number) params.get("page")).intValue() : 1;
+        Integer size = params.get("size") != null ? ((Number) params.get("size")).intValue() : 20;
+
+        Page<Product> pageParam = new Page<>(page, size);
+        LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<Product>()
+                .eq(Product::getDistributionSystemId, system.getId())
+                .orderByDesc(Product::getCreatedAt);
+
+        if (status != null && !status.isEmpty()) {
+            wrapper.eq(Product::getStatus, status);
+        }
+        if (keyword != null && !keyword.isEmpty()) {
+            wrapper.like(Product::getName, keyword);
+        }
+
+        Page<Product> result = productService.adminProductList(pageParam, wrapper);
+        List<ProductDTO> records = result.getRecords().stream()
+                .map(ProductDTO::from)
+                .collect(Collectors.toList());
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("records", records);
+        data.put("total", result.getTotal());
+        data.put("page", result.getCurrent());
+        data.put("size", result.getSize());
+        return Result.success(data);
+    }
+
+    @Operation(summary = "供应商创建商品")
+    @PostMapping("/create")
+    public Result<ProductDTO> create(@RequestBody ProductCreateRequest request,
+                                     @RequestAttribute("userId") Long adminId) {
+        SupplySystem system = getMySystem(adminId);
+        if (system == null) {
+            return Result.error("您没有关联的供应商体系");
+        }
+
+        Product product = request.getProduct();
+        if (product == null || product.getName() == null || product.getName().isEmpty()) {
+            return Result.error("商品名称不能为空");
+        }
+
+        // 自动绑定到供应商的体系
+        product.setDistributionSystemId(system.getId());
+        product.setVendorName(system.getName());
+
+        return productService.adminCreate(product, request.getAssessmentExt());
+    }
+
+    @Operation(summary = "供应商更新商品")
+    @PostMapping("/update")
+    public Result<ProductDTO> update(@RequestBody ProductCreateRequest request,
+                                     @RequestAttribute("userId") Long adminId) {
+        SupplySystem system = getMySystem(adminId);
+        if (system == null) {
+            return Result.error("您没有关联的供应商体系");
+        }
+
+        Product product = request.getProduct();
+        if (product == null || product.getId() == null) {
+            return Result.error("商品ID不能为空");
+        }
+
+        // 校验商品是否属于该供应商的体系
+        Product existing = productService.getById(product.getId());
+        if (existing == null) {
+            return Result.error("商品不存在");
+        }
+        if (!system.getId().equals(existing.getDistributionSystemId())) {
+            return Result.error("无权操作该商品");
+        }
+
+        // 不允许修改 distributionSystemId
+        product.setDistributionSystemId(system.getId());
+
+        return productService.adminUpdate(product, request.getAssessmentExt());
+    }
+
+    @Operation(summary = "供应商商品详情")
+    @PostMapping("/detail")
+    public Result<ProductDTO> detail(@RequestBody Map<String, Object> params,
+                                     @RequestAttribute("userId") Long adminId) {
+        SupplySystem system = getMySystem(adminId);
+        if (system == null) {
+            return Result.error("您没有关联的供应商体系");
+        }
+
+        Long productId = params.get("productId") != null
+                ? Long.valueOf(params.get("productId").toString())
+                : null;
+        if (productId == null) {
+            return Result.error("productId不能为空");
+        }
+
+        // 校验商品是否属于该供应商的体系
+        Product existing = productService.getById(productId);
+        if (existing == null) {
+            return Result.error("商品不存在");
+        }
+        if (!system.getId().equals(existing.getDistributionSystemId())) {
+            return Result.error("无权查看该商品");
+        }
+
+        return productService.adminDetail(productId);
+    }
+
+    @Operation(summary = "供应商删除商品")
+    @PostMapping("/delete")
+    public Result<String> delete(@RequestBody Map<String, Object> params,
+                                 @RequestAttribute("userId") Long adminId) {
+        SupplySystem system = getMySystem(adminId);
+        if (system == null) {
+            return Result.error("您没有关联的供应商体系");
+        }
+
+        Long productId = params.get("productId") != null
+                ? Long.valueOf(params.get("productId").toString())
+                : null;
+        if (productId == null) {
+            return Result.error("productId不能为空");
+        }
+
+        // 校验商品是否属于该供应商的体系
+        Product existing = productService.getById(productId);
+        if (existing == null) {
+            return Result.error("商品不存在");
+        }
+        if (!system.getId().equals(existing.getDistributionSystemId())) {
+            return Result.error("无权操作该商品");
+        }
+
+        return productService.adminDelete(productId);
+    }
+
+    @Operation(summary = "供应商上下架商品")
+    @PostMapping("/shelve")
+    public Result<String> shelve(@RequestBody Map<String, Object> params,
+                                 @RequestAttribute("userId") Long adminId) {
+        SupplySystem system = getMySystem(adminId);
+        if (system == null) {
+            return Result.error("您没有关联的供应商体系");
+        }
+
+        Long productId = params.get("productId") != null
+                ? Long.valueOf(params.get("productId").toString())
+                : null;
+        Boolean shelve = params.get("shelve") != null
+                ? (Boolean) params.get("shelve")
+                : null;
+
+        if (productId == null) {
+            return Result.error("productId不能为空");
+        }
+        if (shelve == null) {
+            return Result.error("shelve不能为空");
+        }
+
+        // 校验商品是否属于该供应商的体系
+        Product existing = productService.getById(productId);
+        if (existing == null) {
+            return Result.error("商品不存在");
+        }
+        if (!system.getId().equals(existing.getDistributionSystemId())) {
+            return Result.error("无权操作该商品");
+        }
+
+        return productService.adminShelve(productId, shelve);
+    }
+}

+ 20 - 23
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplyHierarchyController.java

@@ -41,9 +41,9 @@ public class SupplyHierarchyController {
     @PostMapping("/set")
     public Result<Void> setHierarchy(@RequestBody Map<String, Object> params) {
         try {
-            Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
-            Long parentId = params.get("parentId") != null ? ((Number) params.get("parentId")).longValue() : null;
-            Long childId = params.get("childId") != null ? ((Number) params.get("childId")).longValue() : null;
+            Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
+            Long parentId = params.get("parentId") != null ? Long.valueOf(params.get("parentId").toString()) : null;
+            Long childId = params.get("childId") != null ? Long.valueOf(params.get("childId").toString()) : null;
             if (systemId == null || parentId == null || childId == null) {
                 return Result.error("参数不完整");
             }
@@ -59,8 +59,8 @@ public class SupplyHierarchyController {
     @PostMapping("/remove")
     public Result<Void> removeRelation(@RequestBody Map<String, Object> params) {
         try {
-            Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
-            Long childId = params.get("childId") != null ? ((Number) params.get("childId")).longValue() : null;
+            Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
+            Long childId = params.get("childId") != null ? Long.valueOf(params.get("childId").toString()) : null;
             if (systemId == null || childId == null) {
                 return Result.error("参数不完整");
             }
@@ -73,8 +73,8 @@ public class SupplyHierarchyController {
 
     @PostMapping("/direct-children")
     public Result<List<User>> getDirectChildren(@RequestBody Map<String, Object> params) {
-        Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
-        Long parentId = params.get("parentId") != null ? ((Number) params.get("parentId")).longValue() : null;
+        Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
+        Long parentId = params.get("parentId") != null ? Long.valueOf(params.get("parentId").toString()) : null;
         if (systemId == null || parentId == null) {
             return Result.error("参数不完整");
         }
@@ -84,8 +84,8 @@ public class SupplyHierarchyController {
 
     @PostMapping("/all-children")
     public Result<List<User>> getAllChildren(@RequestBody Map<String, Object> params) {
-        Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
-        Long parentId = params.get("parentId") != null ? ((Number) params.get("parentId")).longValue() : null;
+        Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
+        Long parentId = params.get("parentId") != null ? Long.valueOf(params.get("parentId").toString()) : null;
         if (systemId == null || parentId == null) {
             return Result.error("参数不完整");
         }
@@ -95,8 +95,8 @@ public class SupplyHierarchyController {
 
     @PostMapping("/parent")
     public Result<User> getParent(@RequestBody Map<String, Object> params) {
-        Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
-        Long userId = params.get("userId") != null ? ((Number) params.get("userId")).longValue() : null;
+        Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
+        Long userId = params.get("userId") != null ? Long.valueOf(params.get("userId").toString()) : null;
         if (systemId == null || userId == null) {
             return Result.error("参数不完整");
         }
@@ -106,8 +106,8 @@ public class SupplyHierarchyController {
 
     @PostMapping("/parent-chain")
     public Result<List<User>> getParentChain(@RequestBody Map<String, Object> params) {
-        Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
-        Long userId = params.get("userId") != null ? ((Number) params.get("userId")).longValue() : null;
+        Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
+        Long userId = params.get("userId") != null ? Long.valueOf(params.get("userId").toString()) : null;
         if (systemId == null || userId == null) {
             return Result.error("参数不完整");
         }
@@ -117,7 +117,7 @@ public class SupplyHierarchyController {
 
     @PostMapping("/tree")
     public Result<List<Map<String, Object>>> getTree(@RequestBody Map<String, Object> params) {
-        Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
+        Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
         if (systemId == null) {
             return Result.error("systemId 不能为空");
         }
@@ -181,8 +181,8 @@ public class SupplyHierarchyController {
 
     @PostMapping("/my")
     public Result<Map<String, Object>> getMyRelation(@RequestBody Map<String, Object> params) {
-        Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
-        Long userId = params.get("userId") != null ? ((Number) params.get("userId")).longValue() : null;
+        Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
+        Long userId = params.get("userId") != null ? Long.valueOf(params.get("userId").toString()) : null;
         if (systemId == null || userId == null) {
             return Result.error("参数不完整");
         }
@@ -197,11 +197,8 @@ public class SupplyHierarchyController {
 
     @PostMapping("/change-requests")
     public Result<List<SupplyHierarchyChangeRequest>> getChangeRequests(@RequestBody Map<String, Object> params) {
-        Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
+        Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
         String status = (String) params.get("status");
-        if (systemId == null) {
-            return Result.error("systemId 不能为空");
-        }
         List<SupplyHierarchyChangeRequest> requests = supplyHierarchyService.getChangeRequests(systemId, status);
         return Result.success(requests);
     }
@@ -209,8 +206,8 @@ public class SupplyHierarchyController {
     @PostMapping("/change/apply")
     public Result<Void> applyChange(@RequestBody Map<String, Object> params) {
         try {
-            Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
-            Long targetParentId = params.get("targetParentId") != null ? ((Number) params.get("targetParentId")).longValue() : null;
+            Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
+            Long targetParentId = params.get("targetParentId") != null ? Long.valueOf(params.get("targetParentId").toString()) : null;
             String reason = (String) params.get("reason");
             if (systemId == null || targetParentId == null) {
                 return Result.error("参数不完整");
@@ -227,7 +224,7 @@ public class SupplyHierarchyController {
     @PostMapping("/change/review")
     public Result<Void> reviewChange(@RequestBody Map<String, Object> params) {
         try {
-            Long requestId = params.get("requestId") != null ? ((Number) params.get("requestId")).longValue() : null;
+            Long requestId = params.get("requestId") != null ? Long.valueOf(params.get("requestId").toString()) : null;
             String status = (String) params.get("status");
             String rejectReason = (String) params.get("rejectReason");
             if (requestId == null || status == null) {

+ 3 - 3
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplySettlementController.java

@@ -33,7 +33,7 @@ public class SupplySettlementController {
      */
     @PostMapping("/detail")
     public Result<SupplySettlement> detail(@RequestBody Map<String, Object> params) {
-        Long id = params.get("id") != null ? ((Number) params.get("id")).longValue() : null;
+        Long id = params.get("id") != null ? Long.valueOf(params.get("id").toString()) : null;
         if (id == null) {
             return Result.error("id不能为空");
         }
@@ -46,7 +46,7 @@ public class SupplySettlementController {
     @PostMapping("/detail-items")
     public Result<List<SupplySettlementDetail>> detailItems(@RequestBody Map<String, Object> params) {
         Long settlementId = params.get("settlementId") != null
-                ? ((Number) params.get("settlementId")).longValue() : null;
+                ? Long.valueOf(params.get("settlementId").toString()) : null;
         if (settlementId == null) {
             return Result.error("settlementId不能为空");
         }
@@ -66,7 +66,7 @@ public class SupplySettlementController {
      */
     @PostMapping("/confirm")
     public Result<Void> confirm(@RequestBody Map<String, Object> params) {
-        Long id = params.get("id") != null ? ((Number) params.get("id")).longValue() : null;
+        Long id = params.get("id") != null ? Long.valueOf(params.get("id").toString()) : null;
         if (id == null) {
             return Result.error("id不能为空");
         }

+ 29 - 12
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/SupplySystemController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/api/admin/supply-system")
@@ -18,10 +19,11 @@ public class SupplySystemController {
     private SupplySystemService supplySystemService;
 
     @PostMapping("/list")
-    public Result<Page<SupplySystem>> list(@RequestParam(required = false) String keyword,
-                                           @RequestParam(required = false) String status,
-                                           @RequestParam(defaultValue = "1") int page,
-                                           @RequestParam(defaultValue = "10") int size) {
+    public Result<Page<SupplySystem>> list(@RequestBody(required = false) Map<String, Object> params) {
+        String keyword = (String) params.get("keyword");
+        String status = (String) params.get("status");
+        int page = params.get("page") != null ? ((Number) params.get("page")).intValue() : 1;
+        int size = params.get("size") != null ? ((Number) params.get("size")).intValue() : 10;
         return Result.success(supplySystemService.list(keyword, status, page, size));
     }
 
@@ -37,12 +39,14 @@ public class SupplySystemController {
     }
 
     @PostMapping("/detail")
-    public Result<SupplySystem> detail(@RequestParam Long id) {
+    public Result<SupplySystem> detail(@RequestBody Map<String, Object> params) {
+        Long id = Long.valueOf(params.get("id").toString());
         return Result.success(supplySystemService.detail(id));
     }
 
     @PostMapping("/toggle-status")
-    public Result<Void> toggleStatus(@RequestParam Long id) {
+    public Result<Void> toggleStatus(@RequestBody Map<String, Object> params) {
+        Long id = Long.valueOf(params.get("id").toString());
         boolean success = supplySystemService.toggleStatus(id);
         return success ? Result.success(null) : Result.error("操作失败");
     }
@@ -52,28 +56,41 @@ public class SupplySystemController {
         return Result.success(supplySystemService.listAll());
     }
 
+    @PostMapping("/my-system")
+    public Result<SupplySystem> getMySystem(@RequestAttribute("userId") Long userId) {
+        SupplySystem system = supplySystemService.getByAdminId(userId);
+        if (system == null) {
+            return Result.error("您没有关联的供应商体系");
+        }
+        return Result.success(system);
+    }
+
     // ========== Member Management ==========
 
     @PostMapping("/member/list")
-    public Result<List<SupplySystemMember>> memberList(@RequestParam Long systemId) {
+    public Result<List<SupplySystemMember>> memberList(@RequestBody Map<String, Object> params) {
+        Long systemId = Long.valueOf(params.get("systemId").toString());
         return Result.success(supplySystemService.memberList(systemId));
     }
 
     @PostMapping("/member/add")
-    public Result<SupplySystemMember> addMember(@RequestParam Long systemId,
-                                                @RequestParam Long userId) {
+    public Result<SupplySystemMember> addMember(@RequestBody Map<String, Object> params) {
+        Long systemId = Long.valueOf(params.get("systemId").toString());
+        Long userId = Long.valueOf(params.get("userId").toString());
         return Result.success(supplySystemService.addMember(systemId, userId));
     }
 
     @PostMapping("/member/remove")
-    public Result<Void> removeMember(@RequestParam Long memberId) {
+    public Result<Void> removeMember(@RequestBody Map<String, Object> params) {
+        Long memberId = Long.valueOf(params.get("memberId").toString());
         boolean success = supplySystemService.removeMember(memberId);
         return success ? Result.success(null) : Result.error("移除失败");
     }
 
     @PostMapping("/member/change-role")
-    public Result<Void> changeRole(@RequestParam Long memberId,
-                                   @RequestParam String role) {
+    public Result<Void> changeRole(@RequestBody Map<String, Object> params) {
+        Long memberId = Long.valueOf(params.get("memberId").toString());
+        String role = (String) params.get("role");
         boolean success = supplySystemService.changeRole(memberId, role);
         return success ? Result.success(null) : Result.error("角色变更失败");
     }

+ 13 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/family/FamilyMembersController.java

@@ -5,6 +5,7 @@ import com.etotem.cfc.dto.AddFamilyMemberDTO;
 import com.etotem.cfc.dto.FamilyMemberVO;
 import com.etotem.cfc.dto.SwitchMemberVO;
 import com.etotem.cfc.entity.RelationshipType;
+import com.etotem.cfc.entity.FamilyMemberLog;
 import com.etotem.cfc.service.FamilyMemberService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -155,4 +156,16 @@ public class FamilyMembersController {
         boolean editable = familyMemberService.isEditable(memberId);
         return Result.success(editable);
     }
+
+    @Operation(summary = "查询成员变更日志")
+    @PostMapping("/logs")
+    public Result<List<FamilyMemberLog>> logs(HttpServletRequest request,
+                                              @RequestBody Map<String, Long> body) {
+        Long userId = getUserId(request);
+        if (userId == null) {
+            return Result.error("请先登录");
+        }
+        Long memberId = body != null ? body.get("memberId") : null;
+        return familyMemberService.getMemberLogs(userId, memberId);
+    }
 }

+ 78 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/guide/GuideFamilyListController.java

@@ -0,0 +1,78 @@
+package com.etotem.cfc.controller.guide;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.Family;
+import com.etotem.cfc.entity.FamilyMember;
+import com.etotem.cfc.entity.User;
+import com.etotem.cfc.mapper.FamilyMapper;
+import com.etotem.cfc.mapper.FamilyMemberMapper;
+import com.etotem.cfc.mapper.UserMapper;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/api/guide/family")
+public class GuideFamilyListController {
+
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private FamilyMapper familyMapper;
+
+    @Resource
+    private FamilyMemberMapper familyMemberMapper;
+
+    @PostMapping("/list")
+    public Result<List<Map<String, Object>>> list(@RequestAttribute("userId") Long guideId,
+                                                  @RequestAttribute("role") String role) {
+        if (!"teacher".equals(role)) {
+            return Result.error("Access denied");
+        }
+
+        User guide = userMapper.selectById(guideId);
+        if (guide == null || guide.getTeacherFamilyIds() == null || guide.getTeacherFamilyIds().isEmpty()) {
+            return Result.success(new ArrayList<>());
+        }
+
+        List<Long> familyIds = Arrays.stream(guide.getTeacherFamilyIds().split(","))
+                .map(String::trim)
+                .filter(s -> !s.isEmpty())
+                .map(Long::parseLong)
+                .collect(Collectors.toList());
+
+        if (familyIds.isEmpty()) {
+            return Result.success(new ArrayList<>());
+        }
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Long familyId : familyIds) {
+            Family family = familyMapper.selectById(familyId);
+            if (family == null) continue;
+
+            List<FamilyMember> members = familyMemberMapper.selectList(
+                    new QueryWrapper<FamilyMember>().eq("family_id", familyId));
+
+            Map<String, Object> item = new HashMap<>();
+            item.put("id", family.getId());
+            item.put("familyName", family.getName());
+            item.put("memberCount", members.size());
+            item.put("createdAt", family.getCreatedAt());
+            result.add(item);
+        }
+
+        return Result.success(result);
+    }
+}

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/product/ProductController.java

@@ -105,7 +105,7 @@ public class ProductController {
             for (ProductSku sku : skus) {
                 if (sku.getSpecs() == null) continue;
                 try {
-                    com.alibaba.fastjson.JSONArray arr = JSON.parseArray(sku.getSpecs());
+                    com.alibaba.fastjson.JSONArray arr = JSON.parseArray(sku.getSpecs().toString());
                     if (arr == null) continue;
                     for (int i = 0; i < arr.size(); i++) {
                         com.alibaba.fastjson.JSONObject specObj = arr.getJSONObject(i);

+ 2 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/ContactDTO.java

@@ -26,4 +26,6 @@ public class ContactDTO {
     private String notes;
     private Date createdAt;
     private Date updatedAt;
+    private Long familyMemberId;
+    private String invitedStatus;
 }

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/dto/ProductSkuDTO.java

@@ -32,9 +32,9 @@ public class ProductSkuDTO {
         dto.setImage(sku.getImage());
         dto.setEnabled(sku.getEnabled() != null && sku.getEnabled() == 1);
         // Parse specs JSON to List<Map>
-        if (sku.getSpecs() != null && !sku.getSpecs().isEmpty()) {
+        if (sku.getSpecs() != null) {
             try {
-                List<Map<String, String>> specsList = JSON.parseObject(sku.getSpecs(),
+                List<Map<String, String>> specsList = JSON.parseObject(sku.getSpecs().toString(),
                     new TypeReference<List<Map<String, String>>>() {});
                 dto.setSpecs(specsList);
             } catch (Exception e) {

+ 3 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/UpdateUserDTO.java

@@ -32,4 +32,7 @@ public class UpdateUserDTO {
 
     // AI助手形象: xibao(浠宝)/fubao(福宝)
     private String mascot;
+
+    // 地址
+    private String address;
 }

+ 6 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/Contact.java

@@ -46,4 +46,10 @@ public class Contact implements Serializable {
     private Date createdAt;
 
     private Date updatedAt;
+
+    /** 关联的家庭成员ID(升级后填充) */
+    private Long familyMemberId;
+
+    /** 邀请加入家庭状态: none/invited/accepted/declined */
+    private String invitedStatus;
 }

+ 30 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/EcomSupplier.java

@@ -0,0 +1,30 @@
+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.util.Date;
+
+@Data
+@TableName("ecom_supplier")
+public class EcomSupplier {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private String name;
+
+    private String contactName;
+
+    private String contactPhone;
+
+    private Integer status;
+
+    private String remark;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+}

+ 0 - 46
cfc-backend/src/main/java/com/etotem/cfc/entity/EducationSystem.java

@@ -1,46 +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;
-
-@Data
-@TableName("education_systems")
-public class EducationSystem implements Serializable {
-
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 编码(key)
-     */
-    private String name;
-
-    /**
-     * 显示名称
-     */
-    private String label;
-
-    /**
-     * 描述说明
-     */
-    private String description;
-
-    /**
-     * 排序
-     */
-    private Integer sortOrder;
-
-    /**
-     * 状态: ACTIVE/DISABLED
-     */
-    private String status;
-
-    private Date createdAt;
-
-    private Date updatedAt;
-}

+ 84 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/FamilyFortuneReport.java

@@ -0,0 +1,84 @@
+package com.etotem.cfc.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+
+/**
+ * 家庭天盘周报导出记录
+ */
+@TableName("family_fortune_report")
+public class FamilyFortuneReport {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Integer familyId;
+
+    private String element;
+
+    private String luckyDirection;
+
+    private String pdfPath;
+
+    private Long fileSize;
+
+    private Date createdAt;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getFamilyId() {
+        return familyId;
+    }
+
+    public void setFamilyId(Integer familyId) {
+        this.familyId = familyId;
+    }
+
+    public String getElement() {
+        return element;
+    }
+
+    public void setElement(String element) {
+        this.element = element;
+    }
+
+    public String getLuckyDirection() {
+        return luckyDirection;
+    }
+
+    public void setLuckyDirection(String luckyDirection) {
+        this.luckyDirection = luckyDirection;
+    }
+
+    public String getPdfPath() {
+        return pdfPath;
+    }
+
+    public void setPdfPath(String pdfPath) {
+        this.pdfPath = pdfPath;
+    }
+
+    public Long getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(Long fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+}

+ 22 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/FamilyMemberLog.java

@@ -0,0 +1,22 @@
+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;
+
+@Data
+@TableName("family_member_logs")
+public class FamilyMemberLog implements Serializable {
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private Long familyId;
+    private Long memberId;
+    private String action;
+    private String oldValue;
+    private String newValue;
+    private Long operatorId;
+    private Date createdAt;
+}

+ 0 - 14
cfc-backend/src/main/java/com/etotem/cfc/entity/Guide.java

@@ -46,20 +46,6 @@ public class Guide implements Serializable {
      * 从业年限
      */
     private Integer experienceYears;
-
-    /**
-     * 毕业院校
-     */
-    private String university;
-
-    /**
-     * 教育体系(参考education_systems表)
-     */
-    private String eduSystem;
-
-    /**
-     * 评分
-     */
     private Integer rating;
 
     /**

+ 40 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/HealthMealRecord.java

@@ -0,0 +1,40 @@
+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.util.Date;
+
+@Data
+@TableName("health_meal_record")
+public class HealthMealRecord {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Long memberId;
+
+    private Long checkinId;
+
+    private String mealType;
+
+    private String foodItems;
+
+    private Integer totalCalories;
+
+    private Integer proteinG;
+
+    private Integer fatG;
+
+    private Integer carbsG;
+
+    private Integer fiberG;
+
+    private Date mealTime;
+
+    private String remark;
+
+    private Date createdAt;
+}

+ 30 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/HealthMeditationRecord.java

@@ -0,0 +1,30 @@
+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.util.Date;
+
+@Data
+@TableName("health_meditation_record")
+public class HealthMeditationRecord {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private Long memberId;
+
+    private Long checkinId;
+
+    private Integer durationMinutes;
+
+    private String type;
+
+    private String mood;
+
+    private String remark;
+
+    private Date createdAt;
+}

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/entity/ProductSku.java

@@ -17,7 +17,7 @@ public class ProductSku implements Serializable {
 
     private Long productId;
     private String skuCode;
-    private String specs;
+    private Object specs;
     private BigDecimal price;
     private Integer stock;
     private BigDecimal originalPrice;

+ 32 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/RebateCommissionConfig.java

@@ -0,0 +1,32 @@
+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.util.Date;
+
+@Data
+@TableName("rebate_commission_config")
+public class RebateCommissionConfig {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private String name;
+
+    private Integer rate;
+
+    private Integer rateType;
+
+    private Integer minAmount;
+
+    private Integer maxAmount;
+
+    private String remark;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+}

+ 9 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/RelationshipType.java

@@ -30,5 +30,14 @@ public class RelationshipType implements Serializable {
     /** 是否启用: 1=启用, 0=禁用 */
     private Integer enabled;
 
+    /** 关系分类: blood(血亲)/marriage(姻亲)/social(社会关系) */
+    private String category;
+
+    /** 是否血亲关系: 1=是, 0=否 */
+    private Integer isBloodRelation;
+
+    /** 是否直系亲属: 1=是, 0=否 */
+    private Integer isImmediateFamily;
+
     private Date createdAt;
 }

+ 2 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/SupplySystem.java

@@ -20,6 +20,8 @@ public class SupplySystem implements Serializable {
     private String description;
     private String status;
     private String models;
+    private String apiEndpoint;
+    private String apiKey;
     private Date createdAt;
     private Date updatedAt;
 }

+ 6 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/User.java

@@ -138,6 +138,12 @@ public class User implements Serializable {
     // 管家认证通过时间
     private Date butlerApprovedAt;
 
+    // 营养师审核状态: pending/approved/rejected
+    private String nutritionistStatus;
+
+    // 营养师审核拒绝原因
+    private String nutritionistRejectReason;
+
     private Date createdAt;
 
     private Date updatedAt;

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/mapper/EducationSystemMapper.java → cfc-backend/src/main/java/com/etotem/cfc/mapper/EcomSupplierMapper.java

@@ -1,9 +1,9 @@
 package com.etotem.cfc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.etotem.cfc.entity.EducationSystem;
+import com.etotem.cfc.entity.EcomSupplier;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface EducationSystemMapper extends BaseMapper<EducationSystem> {
+public interface EcomSupplierMapper extends BaseMapper<EcomSupplier> {
 }

+ 9 - 0
cfc-backend/src/main/java/com/etotem/cfc/mapper/FamilyFortuneReportMapper.java

@@ -0,0 +1,9 @@
+package com.etotem.cfc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.etotem.cfc.entity.FamilyFortuneReport;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FamilyFortuneReportMapper extends BaseMapper<FamilyFortuneReport> {
+}

+ 9 - 0
cfc-backend/src/main/java/com/etotem/cfc/mapper/FamilyMemberLogMapper.java

@@ -0,0 +1,9 @@
+package com.etotem.cfc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.etotem.cfc.entity.FamilyMemberLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface FamilyMemberLogMapper extends BaseMapper<FamilyMemberLog> {
+}

+ 7 - 0
cfc-backend/src/main/java/com/etotem/cfc/mapper/HealthMealRecordMapper.java

@@ -0,0 +1,7 @@
+package com.etotem.cfc.mapper;
+
+import com.etotem.cfc.entity.HealthMealRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface HealthMealRecordMapper extends BaseMapper<HealthMealRecord> {
+}

+ 7 - 0
cfc-backend/src/main/java/com/etotem/cfc/mapper/HealthMeditationRecordMapper.java

@@ -0,0 +1,7 @@
+package com.etotem.cfc.mapper;
+
+import com.etotem.cfc.entity.HealthMeditationRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface HealthMeditationRecordMapper extends BaseMapper<HealthMeditationRecord> {
+}

+ 9 - 0
cfc-backend/src/main/java/com/etotem/cfc/mapper/RebateCommissionConfigMapper.java

@@ -0,0 +1,9 @@
+package com.etotem.cfc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.etotem.cfc.entity.RebateCommissionConfig;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RebateCommissionConfigMapper extends BaseMapper<RebateCommissionConfig> {
+}

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/CartService.java

@@ -152,7 +152,7 @@ public class CartService {
             ProductSku sku = productSkuService.getById(cart.getSkuId());
             if (sku != null && sku.getSpecs() != null) {
                 try {
-                    JSONArray specsArr = JSON.parseArray(sku.getSpecs());
+                    JSONArray specsArr = JSON.parseArray(sku.getSpecs().toString());
                     if (specsArr != null) {
                         StringBuilder specDesc = new StringBuilder();
                         for (int i = 0; i < specsArr.size(); i++) {

+ 23 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/ContactService.java

@@ -120,6 +120,27 @@ public class ContactService {
         return Result.success(toDTO(contact));
     }
 
+    public Result<Map<String, Object>> inviteToFamily(Long contactId, String relationshipType, String generationLevel, Long userId) {
+        Contact contact = contactMapper.selectById(contactId);
+        if (contact == null || !contact.getUserId().equals(userId)) {
+            return Result.error("联系人不存在");
+        }
+        if (contact.getFamilyMemberId() != null) {
+            return Result.error("该联系人已是家庭成员");
+        }
+
+        contact.setInvitedStatus("invited");
+        contact.setUpdatedAt(new Date());
+        contactMapper.updateById(contact);
+
+        Map<String, Object> result = new java.util.HashMap<>();
+        result.put("contactId", contactId);
+        result.put("invitedStatus", "invited");
+        result.put("relationshipType", relationshipType);
+        result.put("generationLevel", generationLevel);
+        return Result.success(result);
+    }
+
     public int calcIntimacy(Contact c) {
         int base = Math.min((c.getContactCount() == null ? 0 : c.getContactCount()) * 5, 60);
         int active = 0;
@@ -163,6 +184,8 @@ public class ContactService {
         dto.setNotes(c.getNotes());
         dto.setCreatedAt(c.getCreatedAt());
         dto.setUpdatedAt(c.getUpdatedAt());
+        dto.setFamilyMemberId(c.getFamilyMemberId());
+        dto.setInvitedStatus(c.getInvitedStatus());
         return dto;
     }
 

+ 0 - 33
cfc-backend/src/main/java/com/etotem/cfc/service/EducationSystemService.java

@@ -1,33 +0,0 @@
-package com.etotem.cfc.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.etotem.cfc.entity.EducationSystem;
-import com.etotem.cfc.mapper.EducationSystemMapper;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class EducationSystemService extends ServiceImpl<EducationSystemMapper, EducationSystem> {
-
-    public List<EducationSystem> getActiveSystems() {
-        LambdaQueryWrapper<EducationSystem> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(EducationSystem::getStatus, "ACTIVE")
-               .orderByAsc(EducationSystem::getSortOrder);
-        return this.list(wrapper);
-    }
-
-    public EducationSystem createSystem(EducationSystem system) {
-        this.save(system);
-        return system;
-    }
-
-    public boolean updateSystem(EducationSystem system) {
-        return this.updateById(system);
-    }
-
-    public boolean deleteSystem(Long id) {
-        return this.removeById(id);
-    }
-}

+ 45 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/FamilyMemberService.java

@@ -1,6 +1,7 @@
 package com.etotem.cfc.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.etotem.cfc.common.Result;
 import com.etotem.cfc.dto.AddFamilyMemberDTO;
 import com.etotem.cfc.dto.FamilyMemberVO;
 import com.etotem.cfc.dto.SwitchMemberVO;
@@ -8,11 +9,13 @@ import com.etotem.cfc.entity.Family;
 import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.entity.FamilyRelationship;
 import com.etotem.cfc.entity.FamilyMemberAttributes;
+import com.etotem.cfc.entity.FamilyMemberLog;
 import com.etotem.cfc.entity.RelationshipType;
 import com.etotem.cfc.entity.User;
 import com.etotem.cfc.enums.GenerationLevel;
 import com.etotem.cfc.mapper.FamilyMapper;
 import com.etotem.cfc.mapper.FamilyMemberAttributesMapper;
+import com.etotem.cfc.mapper.FamilyMemberLogMapper;
 import com.etotem.cfc.mapper.FamilyMemberMapper;
 import com.etotem.cfc.mapper.RelationshipTypeMapper;
 import com.etotem.cfc.mapper.UserMapper;
@@ -57,6 +60,9 @@ public class FamilyMemberService {
     @Resource
     private FamilyRelationshipService familyRelationshipService;
 
+    @Resource
+    private FamilyMemberLogMapper familyMemberLogMapper;
+
     /**
      * 添加家庭成员
      */
@@ -159,6 +165,9 @@ public class FamilyMemberService {
 
         familyMemberMapper.insert(member);
 
+        // 写入变更日志
+        logMemberAction(member.getFamilyId(), member.getId(), "join", null, member.getNickname(), userId);
+
         // children 表已废除,无需同步。角色信息通过 computeEffectiveRole() 自动计算。
         // 若需要 child 专属初始化(如游戏数据),后续在 computeEffectiveRole() 返回 child 时处理。
 
@@ -291,6 +300,7 @@ public class FamilyMemberService {
             // 先清理关系记录
             familyRelationshipService.deleteRelationsForMember(memberId);
             familyMemberMapper.deleteById(memberId);
+            logMemberAction(operator.getFamilyId(), memberId, "kick", member.getNickname(), null, userId);
             // 如果关联了 User,清除其 familyId
             if (member.getUserId() != null) {
                 User targetUser = userMapper.selectById(member.getUserId());
@@ -347,6 +357,8 @@ public class FamilyMemberService {
             throw new RuntimeException("该成员关联了登录账号,不可编辑");
         }
 
+        String oldNickname = member.getNickname();
+
         if (dto.getNickname() != null && !dto.getNickname().trim().isEmpty()) {
             member.setNickname(dto.getNickname().trim());
         }
@@ -373,6 +385,7 @@ public class FamilyMemberService {
 
         member.setUpdatedAt(new Date());
         familyMemberMapper.updateById(member);
+        logMemberAction(member.getFamilyId(), member.getId(), "update", oldNickname, member.getNickname(), userId);
 
         // 同步更新 family_members 中的 child 专属字段
         if ("child".equals(computeEffectiveRole(member))) {
@@ -604,4 +617,36 @@ public class FamilyMemberService {
         }
         return null;
     }
+
+    private void logMemberAction(Long familyId, Long memberId, String action, String oldValue, String newValue, Long operatorId) {
+        try {
+            FamilyMemberLog logEntry = new FamilyMemberLog();
+            logEntry.setFamilyId(familyId);
+            logEntry.setMemberId(memberId);
+            logEntry.setAction(action);
+            logEntry.setOldValue(oldValue);
+            logEntry.setNewValue(newValue);
+            logEntry.setOperatorId(operatorId);
+            logEntry.setCreatedAt(new Date());
+            familyMemberLogMapper.insert(logEntry);
+        } catch (Exception e) {
+            log.warn("写入家庭成员日志失败: {}", e.getMessage());
+        }
+    }
+
+    public Result<List<FamilyMemberLog>> getMemberLogs(Long userId, Long memberId) {
+        User user = userMapper.selectById(userId);
+        if (user == null || user.getFamilyId() == null) {
+            return Result.error("用户未加入家庭");
+        }
+        Long familyId = user.getFamilyId();
+        LambdaQueryWrapper<FamilyMemberLog> query = new LambdaQueryWrapper<FamilyMemberLog>()
+                .eq(FamilyMemberLog::getFamilyId, familyId)
+                .orderByDesc(FamilyMemberLog::getCreatedAt);
+        if (memberId != null) {
+            query.eq(FamilyMemberLog::getMemberId, memberId);
+        }
+        List<FamilyMemberLog> logs = familyMemberLogMapper.selectList(query);
+        return Result.success(logs);
+    }
 }

+ 25 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/PdfReportService.java

@@ -0,0 +1,25 @@
+package com.etotem.cfc.service;
+
+import com.etotem.cfc.entity.FamilyFortuneReport;
+import java.util.function.UnaryOperator;
+
+/**
+ * PDF 周报生成服务
+ */
+public interface PdfReportService {
+    /**
+     * 将 Base64 图片转换为 PDF 字节数组
+     */
+    byte[] generatePdfReport(String imageBase64, String element, String luckyDirection, String tip);
+
+    /**
+     * 保存 PDF 文件到本地文件系统
+     * @return 文件名
+     */
+    String savePdfReport(byte[] pdfBytes, Long familyId, String element);
+
+    /**
+     * 保存 PDF 报告记录到数据库
+     */
+    void saveReport(UnaryOperator<FamilyFortuneReport> configurer);
+}

+ 4 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/ProductService.java

@@ -39,6 +39,10 @@ public class ProductService {
     @Resource
     private PpointService ppointService;
 
+    public Product getById(Long id) {
+        return productMapper.selectById(id);
+    }
+
     public Result<Map<String, Object>> list(ProductListQueryDTO query, Long userId) {
         Page<Product> page = new Page<>(query.getPage(), query.getSize());
         LambdaQueryWrapper<Product> wrapper = new LambdaQueryWrapper<Product>()

+ 44 - 6
cfc-backend/src/main/java/com/etotem/cfc/service/ProductSkuService.java

@@ -28,12 +28,15 @@ public class ProductSkuService {
 
     @Transactional
     public ProductSku create(ProductSku sku) {
-        sku.setSpecs(normalizeSpecsToJson(sku.getSpecs()));
+        sku.setSpecs(normalizeSpecsToJson(String.valueOf(sku.getSpecs())));
         sku.setCreateTime(new Date());
         sku.setUpdateTime(new Date());
         if (sku.getEnabled() == null) {
             sku.setEnabled(1);
         }
+        if (sku.getSkuCode() == null || sku.getSkuCode().isEmpty()) {
+            sku.setSkuCode("SKU-" + sku.getProductId() + "-" + System.currentTimeMillis());
+        }
         skuMapper.insert(sku);
         return sku;
     }
@@ -41,7 +44,7 @@ public class ProductSkuService {
     @Transactional
     public void update(ProductSku sku) {
         if (sku.getSpecs() != null) {
-            sku.setSpecs(normalizeSpecsToJson(sku.getSpecs()));
+            sku.setSpecs(normalizeSpecsToJson(String.valueOf(sku.getSpecs())));
         }
         sku.setUpdateTime(new Date());
         skuMapper.updateById(sku);
@@ -85,15 +88,50 @@ public class ProductSkuService {
      * 此方法将 "k1:v1;k2:v2" 格式转为 {"k1":"v1","k2":"v2"};
      * 如果已经是合法 JSON 字符串则原样返回。
      */
-    static String normalizeSpecsToJson(String specs) {
-        if (specs == null || specs.trim().isEmpty()) {
-            return "{}";
+    static String normalizeSpecsToJson(Object specsObj) {
+        if (specsObj == null) return "{}";
+        String specs;
+        if (specsObj instanceof String) {
+            specs = (String) specsObj;
+        } else {
+            specs = specsObj.toString();
         }
+        if (specs.trim().isEmpty()) return "{}";
         String trimmed = specs.trim();
         // 已是合法 JSON 对象/数组,直接返回
-        if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+        if (trimmed.startsWith("{")) {
             return trimmed;
         }
+        // 数组格式转 JSON 对象:["红色","M码"] → {"规格":"红色","规格2":"M码"}
+        if (trimmed.startsWith("[")) {
+            if (trimmed.contains("[object Object]") || trimmed.contains("[undefined]")) {
+                return "{}";
+            }
+            String body = trimmed.substring(1, trimmed.length() - 1);
+            Map<String, String> map = new LinkedHashMap<>();
+            int idx = 1;
+            for (String item : body.split(",", -1)) {
+                item = item.trim();
+                if (item.isEmpty()) continue;
+                if (item.startsWith("\"")) item = item.substring(1);
+                if (item.endsWith("\"")) item = item.substring(0, item.length() - 1);
+                map.put("规格" + idx, item);
+                idx++;
+            }
+            if (map.isEmpty()) {
+                return "{}";
+            }
+            StringBuilder sb = new StringBuilder("{");
+            boolean first = true;
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                if (!first) sb.append(",");
+                first = false;
+                sb.append("\"").append(escapeJson(entry.getKey())).append("\":");
+                sb.append("\"").append(escapeJson(entry.getValue())).append("\"");
+            }
+            sb.append("}");
+            return sb.toString();
+        }
         // 将 k1:v1;k2:v2 格式转为 JSON 对象
         Map<String, String> map = new LinkedHashMap<>();
         String[] pairs = trimmed.split("[;;]");

+ 3 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/SupplyHierarchyService.java

@@ -189,7 +189,9 @@ public class SupplyHierarchyService extends ServiceImpl<SupplyHierarchyMapper, S
 
     public List<SupplyHierarchyChangeRequest> getChangeRequests(Long systemId, String status) {
         LambdaQueryWrapper<SupplyHierarchyChangeRequest> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(SupplyHierarchyChangeRequest::getSystemId, systemId);
+        if (systemId != null) {
+            wrapper.eq(SupplyHierarchyChangeRequest::getSystemId, systemId);
+        }
         if (status != null && !status.isEmpty()) {
             wrapper.eq(SupplyHierarchyChangeRequest::getStatus, status);
         }

+ 4 - 4
cfc-backend/src/main/java/com/etotem/cfc/service/SupplySettlementService.java

@@ -45,9 +45,9 @@ public class SupplySettlementService extends ServiceImpl<SupplySettlementMapper,
      * 分页查询结算记录列表
      */
     public Result<Map<String, Object>> list(Map<String, Object> params) {
-        Integer pageNum = params.get("page") != null ? ((Number) params.get("page")).intValue() : 1;
-        Integer pageSize = params.get("size") != null ? ((Number) params.get("size")).intValue() : 20;
-        Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
+        Integer pageNum = params.get("page") != null ? Integer.parseInt(params.get("page").toString()) : 1;
+        Integer pageSize = params.get("size") != null ? Integer.parseInt(params.get("size").toString()) : 20;
+        Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
         String status = (String) params.get("status");
 
         Page<SupplySettlement> pageParam = new Page<>(pageNum, pageSize);
@@ -100,7 +100,7 @@ public class SupplySettlementService extends ServiceImpl<SupplySettlementMapper,
      */
     @Transactional
     public Result<SupplySettlement> createSettlement(Map<String, Object> params) {
-        Long systemId = params.get("systemId") != null ? ((Number) params.get("systemId")).longValue() : null;
+        Long systemId = params.get("systemId") != null ? Long.valueOf(params.get("systemId").toString()) : null;
         String periodStartStr = (String) params.get("periodStart");
         String periodEndStr = (String) params.get("periodEnd");
 

+ 8 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/SupplySystemService.java

@@ -83,6 +83,14 @@ public class SupplySystemService extends ServiceImpl<SupplySystemMapper, SupplyS
         return this.list(wrapper);
     }
 
+    public SupplySystem getByAdminId(Long adminId) {
+        LambdaQueryWrapper<SupplySystem> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SupplySystem::getAdminId, adminId)
+               .eq(SupplySystem::getStatus, "active")
+               .last("LIMIT 1");
+        return this.getOne(wrapper);
+    }
+
     // ========== Member Management ==========
 
     public List<SupplySystemMember> memberList(Long systemId) {

+ 5 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/UserService.java

@@ -1038,7 +1038,11 @@ private FamilyInvitationService familyInvitationService;
             user.setDietPreferences(dto.getDietPreferences());
             recordProfileChange(userId, "dietPreferences", oldDiet, dto.getDietPreferences(), "user_edit");
         }
-        user.setUpdatedAt(new Date());
+        // 更新地址
+        if (dto.getAddress() != null) {
+            user.setAddress(dto.getAddress());
+        }
+
         userMapper.updateById(user);
         return true;
     }

+ 169 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/impl/PdfReportServiceImpl.java

@@ -0,0 +1,169 @@
+package com.etotem.cfc.service.impl;
+
+import com.etotem.cfc.entity.FamilyFortuneReport;
+import com.etotem.cfc.mapper.FamilyFortuneReportMapper;
+import com.etotem.cfc.service.PdfReportService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Base64;
+import java.util.Date;
+import java.util.function.UnaryOperator;
+
+/**
+ * PDF 周报生成服务实现
+ * 简化实现:图片数据直接通过 Base64 嵌入到简单 PDF 包装(最小可行方案)
+ * 注意:该实现未引入 iText 等重型依赖,优先保证可编译运行
+ */
+@Service
+public class PdfReportServiceImpl implements PdfReportService {
+
+    private static final Logger log = LoggerFactory.getLogger(PdfReportServiceImpl.class);
+
+    @Resource
+    private FamilyFortuneReportMapper reportMapper;
+
+    @Value("${report.storage.path:storage/reports/}")
+    private String storagePath;
+
+    @Override
+    public byte[] generatePdfReport(String imageBase64, String element, String luckyDirection, String tip) {
+        // imageBase64 已由前端去除前缀(data:image/png;base64,)
+        String base64Data = stripDataUriPrefix(imageBase64);
+        byte[] imageBytes;
+        try {
+            imageBytes = Base64.getDecoder().decode(base64Data);
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("图片数据格式错误: " + e.getMessage());
+        }
+        // 简单包装:返回图片字节 + 标识(最小实现,生产环境应使用 iText/PDFBox)
+        return buildSimplePdfFromImage(imageBytes, element, luckyDirection, tip);
+    }
+
+    @Override
+    public String savePdfReport(byte[] pdfBytes, Long familyId, String element) {
+        // 确保存储目录存在
+        File dir = new File(storagePath);
+        if (!dir.exists()) {
+            if (!dir.mkdirs()) {
+                throw new RuntimeException("无法创建报告存储目录: " + dir.getAbsolutePath());
+            }
+        }
+
+        // 生成文件名:心天盘周报_{家庭ID}_{年份}_{周}_{元素}.pdf
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
+        String year = sdf.format(new Date());
+        int week = getCurrentWeekNumber();
+        String fileName = String.format(
+            "心天盘周报_%d_%s年第%d周_%s.pdf",
+            familyId, year, week, element != null ? element : "火"
+        );
+
+        // 安全性:去除文件名中的不安全字符
+        fileName = fileName.replaceAll("[\\\\/:*?\"<>|]", "_");
+
+        File targetFile = new File(dir, fileName);
+        try (FileOutputStream fos = new FileOutputStream(targetFile)) {
+            fos.write(pdfBytes);
+            fos.flush();
+            log.info("PDF 周报保存成功: {}", targetFile.getAbsolutePath());
+            return fileName;
+        } catch (IOException e) {
+            throw new RuntimeException("PDF 文件保存失败: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void saveReport(UnaryOperator<FamilyFortuneReport> configurer) {
+        FamilyFortuneReport report = configurer.apply(new FamilyFortuneReport());
+        if (report != null) {
+            report.setCreatedAt(new Date());
+            reportMapper.insert(report);
+        }
+    }
+
+    /**
+     * 去除 Base64 图片前缀 data:image/png;base64, 等
+     */
+    private String stripDataUriPrefix(String base64) {
+        if (base64 == null) return "";
+        int commaIndex = base64.indexOf(',');
+        return commaIndex > 0 ? base64.substring(commaIndex + 1) : base64;
+    }
+
+    /**
+     * 构建简单 PDF 包装(占位实现 - 生产环境应使用 iText)
+     * 这里返回一个带 PDF 头部的最小字节数组,确保文件可被识别为 PDF
+     */
+    private byte[] buildSimplePdfFromImage(byte[] imageBytes, String element, String luckyDirection, String tip) {
+        // 简化方案:生成 PDF 占位文件
+        // 实际项目中需要使用 iText 或 Apache PDFBox 进行完整 PDF 渲染
+        String content = "家庭天盘周报\\n主导元素: " + safeText(element) +
+            "\\n吉位: " + safeText(luckyDirection) +
+            "\\n本周提示: " + safeText(tip);
+
+        // 构建简单的 PDF 文档(最小可行实现)
+        String pdfContent = "BT /F1 12 Tf 72 720 Td (Family Fortune Report) Tj ET\\n" +
+            "BT /F1 10 Tf 72 700 Td (Element: " + safeText(element) + ") Tj ET\\n" +
+            "BT /F1 10 Tf 72 685 Td (Lucky Direction: " + safeText(luckyDirection) + ") Tj ET\\n" +
+            "BT /F1 10 Tf 72 670 Td (Tip: " + safeText(tip) + ") Tj ET\\n";
+
+        return buildMinimalPdf(pdfContent, imageBytes.length);
+    }
+
+    private String safeText(String s) {
+        if (s == null) return "";
+        return s.replaceAll("[()\\\\]", "");
+    }
+
+    /**
+     * 构建最简单的 PDF 文档字节流
+     */
+    private byte[] buildMinimalPdf(String content, int imageLength) {
+        StringBuilder pdf = new StringBuilder();
+        pdf.append("%PDF-1.4\\n");
+        pdf.append("1 0 obj\\n<< /Type /Catalog /Pages 2 0 R >>\\nendobj\\n");
+        pdf.append("2 0 obj\\n<< /Type /Pages /Kids [3 0 R] /Count 1 >>\\nendobj\\n");
+        pdf.append("3 0 obj\\n<< /Type /Page /Parent 2 0 R /MediaBox [0 0 612 792] /Contents 4 0 R /Resources << /Font << /F1 5 0 R >> >> >>\\nendobj\\n");
+        pdf.append("4 0 obj\\n<< /Length ").append(content.length()).append(" >>\\nstream\\n").append(content).append("\\nendstream\\nendobj\\n");
+        pdf.append("5 0 obj\\n<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>\\nendobj\\n");
+        pdf.append("xref\\n0 6\\n");
+        pdf.append("0000000000 65535 f \\n");
+        pdf.append("0000000009 00000 n \\n");
+        pdf.append("0000000058 00000 n \\n");
+        pdf.append("0000000111 00000 n \\n");
+        pdf.append("0000000213 00000 n \\n");
+        pdf.append("0000000").append(300 + content.length()).append(" 00000 n \\n");
+        pdf.append("trailer\\n<< /Size 6 /Root 1 0 R >>\\n");
+        pdf.append("startxref\\n").append(400 + content.length()).append("\\n");
+        pdf.append("%%EOF\\n");
+
+        // 注:当前公共 API 不支持中文嵌入,使用 ASCII-only 简化文本
+        String generated = pdf.toString()
+            .replace("\\n", System.lineSeparator())
+            .replace("\\(", "(")
+            .replace("\\)", ")");
+
+        // 附带图片数据大小信息(用于文件大小计算)
+        byte[] pdfBytes = generated.getBytes();
+        // 拼接实际内容字节(生产环境应使用真正的 PDF 库)
+        byte[] result = new byte[pdfBytes.length + imageLength];
+        System.arraycopy(pdfBytes, 0, result, 0, pdfBytes.length);
+        // 图片数据不直接嵌入简化 PDF(避免二进制截断问题)
+        return result;
+    }
+
+    private int getCurrentWeekNumber() {
+        java.util.Calendar cal = java.util.Calendar.getInstance();
+        cal.setTime(new Date());
+        return cal.get(java.util.Calendar.WEEK_OF_YEAR);
+    }
+}

+ 3905 - 13
cfc-backend/src/main/resources/schema.sql

@@ -1,14 +1,3906 @@
--- 家庭运势表(家庭天盘)
-CREATE TABLE IF NOT EXISTS family_fortune (
-  id BIGINT AUTO_INCREMENT PRIMARY KEY,
-  family_id BIGINT NOT NULL COMMENT '家庭ID',
-  dominant_element VARCHAR(10) COMMENT '主导五行',
-  lucky_direction VARCHAR(10) COMMENT '吉位方向',
-  fortune_level VARCHAR(10) COMMENT '运势等级:大吉/吉/平/凶/大凶',
-  mood_score INT COMMENT '心情分数(0-100)',
-  daily_tip VARCHAR(200) COMMENT '每日提示',
-  fortune_date DATE NOT NULL COMMENT '运势日期',
+-- 浠艾福数据库初始化脚本
+-- 自动创建表
+
+-- 家庭表
+CREATE TABLE IF NOT EXISTS families (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(100),
+    invite_code VARCHAR(8) UNIQUE,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_invite_code (invite_code)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 用户表
+CREATE TABLE IF NOT EXISTS users (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    openid VARCHAR(64) NOT NULL,
+    unionid VARCHAR(64),
+    family_id BIGINT NOT NULL,
+    role ENUM('parent','child','teacher','supplier_admin') NOT NULL,
+    nickname VARCHAR(50),
+    avatar VARCHAR(255),
+    password VARCHAR(128),
+    id_card VARCHAR(18),
+    real_name VARCHAR(50),
+    phone VARCHAR(11),
+    birthday DATE,
+    gender ENUM('male','female'),
+    birth_hour VARCHAR(10) COMMENT '出生时辰: 子丑寅卯辰巳午未申酉戌亥',
+    mascot VARCHAR(20) DEFAULT NULL COMMENT 'AI助手形象: xibao(浠宝)/fubao(福宝)',
+    address VARCHAR(500) COMMENT '地址',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    butler_status VARCHAR(20) COMMENT '管家状态: null/pending/approved/rejected',
+    butler_info TEXT COMMENT '管家资质信息(JSON)',
+    butler_approved_at DATETIME COMMENT '管家认证通过时间',
+    nutritionist_status VARCHAR(20) DEFAULT NULL COMMENT '营养师审核状态: pending/approved/rejected',
+    nutritionist_reject_reason VARCHAR(500) DEFAULT NULL COMMENT '营养师审核拒绝原因',
+    INDEX idx_openid (openid),
+    INDEX idx_family_id (family_id),
+    INDEX idx_phone (phone)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ============================================================
+-- 【已废除】children 表已合并到 family_members
+-- 保留此处仅作参考,勿执行
+-- ============================================================
+-- CREATE TABLE IF NOT EXISTS children (
+--     id BIGINT AUTO_INCREMENT PRIMARY KEY,
+--     user_id BIGINT NOT NULL,
+--     family_id BIGINT NOT NULL,
+--     nickname VARCHAR(50) NOT NULL,
+--     age TINYINT NOT NULL,
+--     birthday DATE,
+--     gender ENUM('male','female'),
+--     penalty_enabled TINYINT DEFAULT 1 COMMENT '是否开启扣分(0否1是)',
+--     theme VARCHAR(32) DEFAULT 'default',
+--     total_points INT DEFAULT 0,
+--     system_points INT DEFAULT 0 COMMENT '系统积分(测评建档/平台发放)',
+--     streak_days INT DEFAULT 0,
+--     last_task_date DATE,
+--     focus_max_daily TINYINT DEFAULT 3,
+--     focus_remaining TINYINT DEFAULT 3,
+--     focus_reset_date DATE,
+--     created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+--     updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+--     INDEX idx_user_id (user_id),
+--     INDEX idx_family_id (family_id)
+-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 任务表
+CREATE TABLE IF NOT EXISTS tasks (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL,
+    creator_id BIGINT NOT NULL,
+    child_id BIGINT COMMENT '执行者ID(child任务时必填,parent任务时可空)',
+    executor_type VARCHAR(20) COMMENT '执行者类型: child/parent',
+    executor_id BIGINT COMMENT '执行者ID',
+    title VARCHAR(200) NOT NULL,
+    description TEXT,
+    points TINYINT DEFAULT 2 COMMENT '任务积分1-10',
+    deadline DATETIME NOT NULL,
+    repeat_type ENUM('none', 'daily', 'weekly') DEFAULT 'none',
+    category VARCHAR(32),
+    need_review TINYINT DEFAULT 0 COMMENT '是否需要审核',
+    review_by_category TINYINT DEFAULT 0 COMMENT '是否按分类审核',
+    status ENUM('pending', 'completed', 'overdue', 'cancelled') DEFAULT 'pending',
+    completed_at DATETIME,
+    bonus_rule JSON COMMENT '积分奖励规则',
+    points_expire_days INT DEFAULT 0 COMMENT '积分有效期天数',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_child_id_deadline (child_id, deadline),
+    INDEX idx_status (status),
+    INDEX idx_category (category),
+    INDEX idx_executor (executor_type, executor_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 积分流水表
+CREATE TABLE IF NOT EXISTS points_log (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL,
+    family_member_id BIGINT COMMENT '家庭成员ID',
+    task_id BIGINT,
+    amount INT NOT NULL COMMENT '积分数量正负',
+    type ENUM('earn', 'spend', 'bonus', 'penalty', 'adjust', 'reset', 'refund') NOT NULL,
+    category VARCHAR(20) DEFAULT 'task' COMMENT '积分分类: task-任务积分, system-系统积分',
+    description TEXT,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_child_id_created (child_id, created_at),
+    INDEX idx_type (type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 积分清零记录表
+CREATE TABLE IF NOT EXISTS points_reset_log (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL,
+    balance_before INT NOT NULL,
+    balance_after INT DEFAULT 0,
+    reset_type ENUM('monthly', 'manual') NOT NULL,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_child_id (child_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 奖励表
+CREATE TABLE IF NOT EXISTS rewards (
+id BIGINT AUTO_INCREMENT PRIMARY KEY,
+family_id BIGINT NOT NULL COMMENT '家庭 ID,所有奖励必须关联家庭',
+child_id BIGINT NULL COMMENT '孩子 ID,模板奖励为NULL',
+title VARCHAR(100) NOT NULL,
+points_required INT NOT NULL,
+category VARCHAR(32),
+status ENUM('available', 'pending', 'exchanged', 'rejected') DEFAULT 'available',
+exchange_approved TINYINT COMMENT '是否审批通过',
+exchanged_at DATETIME,
+is_template TINYINT DEFAULT 0 COMMENT '是否为预设模板',
+created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+INDEX idx_family_id (family_id),
+INDEX idx_child_id_status (child_id, status),
+INDEX idx_is_template (is_template)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='奖励表,所有奖励必须关联到具体家庭';
+
+-- 奖励分类表
+CREATE TABLE IF NOT EXISTS reward_categories (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL,
+    name VARCHAR(32) NOT NULL,
+    icon VARCHAR(64),
+    sort_order INT DEFAULT 0,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_family_id (family_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 预设奖励模板数据(child_id为NULL表示模板)
+INSERT IGNORE INTO rewards (family_id, child_id, title, points_required, category, is_template) VALUES
+(0, NULL, '看动画片30分钟', 30, '精神奖励', 1),
+(0, NULL, '玩平板游戏30分钟', 40, '特权奖励', 1),
+(0, NULL, '去游乐场', 100, '物质奖励', 1),
+(0, NULL, '买玩具', 150, '物质奖励', 1),
+(0, NULL, '吃冰淇淋', 20, '物质奖励', 1),
+(0, NULL, '选择晚餐', 25, '特权奖励', 1);
+
+-- 默认奖励分类
+INSERT IGNORE INTO reward_categories (family_id, name, icon, sort_order) VALUES
+(0, '物质奖励', 'gift', 1),
+(0, '精神奖励', 'star', 2),
+(0, '特权奖励', 'crown', 3);
+
+-- 敏感词表
+CREATE TABLE IF NOT EXISTS sensitive_words (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    word VARCHAR(50) NOT NULL,
+    category VARCHAR(32) NOT NULL,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_word (word)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 任务审核表
+CREATE TABLE IF NOT EXISTS task_reviews (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    task_id BIGINT NOT NULL,
+    child_id BIGINT NOT NULL,
+    photo_url VARCHAR(255),
+    voice_note_url VARCHAR(255),
+    ai_result ENUM('pass', 'review', 'pending'),
+    ai_confidence INT COMMENT 'AI置信度(0-100)',
+    ai_suggestion VARCHAR(255),
+    ai_threshold ENUM('strict', 'normal', 'loose') DEFAULT 'normal',
+    parent_result ENUM('pass', 'reject'),
+    parent_override TINYINT DEFAULT 0,
+    review_type ENUM('ai', 'manual') NOT NULL,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    reviewed_at DATETIME,
+    INDEX idx_task_id (task_id),
+    INDEX idx_ai_result (ai_result)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 打卡里程碑表
+CREATE TABLE IF NOT EXISTS streak_milestones (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    days INT NOT NULL,
+    reward_points INT DEFAULT 0,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 插入打卡里程碑数据
+INSERT IGNORE INTO streak_milestones (days, reward_points) VALUES
+(3, 5),
+(7, 10),
+(30, 30),
+(100, 100);
+
+-- 专注训练记录表
+CREATE TABLE IF NOT EXISTS focus_sessions (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL,
+    mode ENUM('simple', 'pomodoro') NOT NULL,
+    duration TINYINT NOT NULL,
+    stars TINYINT COMMENT '评分1-5',
+    points_earned INT,
+    voice_note_url VARCHAR(255),
+    started_at DATETIME NOT NULL,
+    completed_at DATETIME,
+    INDEX idx_child_id_completed (child_id, completed_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 专注训练配置表
+CREATE TABLE IF NOT EXISTS focus_config (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT,
+    max_daily_count TINYINT DEFAULT 3,
+    allow_exit TINYINT DEFAULT 1 COMMENT '是否允许退出(0否1是)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- DAN测评表
+CREATE TABLE IF NOT EXISTS dan_assessments (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL,
+    assessment_date DATE NOT NULL,
+    details JSON,
+    source ENUM('api', 'manual') DEFAULT 'manual',
+    photo_url VARCHAR(255),
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 任务模板表
+CREATE TABLE IF NOT EXISTS task_templates (
+id BIGINT AUTO_INCREMENT PRIMARY KEY,
+title VARCHAR(200) NOT NULL,
+points TINYINT DEFAULT 2,
+duration_minutes TINYINT,
+category VARCHAR(32),
+is_default TINYINT DEFAULT 1,
+family_id BIGINT,
+created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+INDEX idx_is_default (is_default)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 媒体记录表(支持图片、视频、音频、文字)
+CREATE TABLE IF NOT EXISTS media_records (
+id BIGINT AUTO_INCREMENT PRIMARY KEY,
+type ENUM('image', 'video', 'audio', 'text') NOT NULL,
+url VARCHAR(500),
+description TEXT,
+task_id BIGINT NOT NULL,
+creator_id BIGINT NOT NULL,
+original_filename VARCHAR(255),
+file_size BIGINT,
+content_type VARCHAR(100),
+created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+INDEX idx_task_id (task_id),
+INDEX idx_creator_id (creator_id),
+INDEX idx_type (type),
+FOREIGN KEY (task_id) REFERENCES tasks(id) ON DELETE CASCADE,
+FOREIGN KEY (creator_id) REFERENCES users(id) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- =============================================
+-- 服务商(成长规划师)相关表
+-- =============================================
+
+-- 服务商表(统一管理 teacher/planner/activity_provider/product_supplier)
+CREATE TABLE IF NOT EXISTS guides (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT NOT NULL UNIQUE COMMENT '用户ID(唯一)',
+    type VARCHAR(32) DEFAULT 'teacher' COMMENT '服务商类型: teacher/planner/activity_provider/product_supplier',
+    teacher_no VARCHAR(20) COMMENT '服务商编号',
+    title VARCHAR(50) COMMENT '职称/称号',
+    specialty VARCHAR(200) COMMENT '专长领域',
+    bio TEXT COMMENT '简介',
+    experience_years TINYINT DEFAULT 0 COMMENT '从业年限',
+    rating INT DEFAULT 500 COMMENT '评分(百分位,500=5.00)',
+    total_appointments INT DEFAULT 0 COMMENT '总服务次数',
+    level VARCHAR(20) NOT NULL DEFAULT 'junior' COMMENT '等级: junior-初级, intermediate-中级, senior-高级',
+    status VARCHAR(20) NOT NULL DEFAULT 'active' COMMENT '状态: active-活跃, inactive-停用',
+    service_count INT DEFAULT 0 COMMENT '当前服务家庭数',
+    package_id BIGINT COMMENT '购买套餐ID',
+    nickname VARCHAR(100) COMMENT '申请昵称',
+    phone VARCHAR(20) COMMENT '联系电话',
+    intro TEXT COMMENT '个人介绍',
+    avatar VARCHAR(500) COMMENT '头像URL',
+    commission_rate INT DEFAULT 1000 COMMENT '佣金比例(基点,1000=10%)',
+    street_id BIGINT COMMENT '街道ID',
+    province VARCHAR(50) COMMENT '省份',
+    city VARCHAR(50) COMMENT '城市',
+    district VARCHAR(50) COMMENT '区县',
+    street VARCHAR(100) COMMENT '街道',
+    approved_at DATETIME COMMENT '审核通过时间',
+    verified_at DATETIME COMMENT '认证通过时间',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_user_id (user_id),
+    INDEX idx_level (level),
+    INDEX idx_status (status),
+    INDEX idx_type (type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务商表(规划师/活动方/供应商)';
+
+-- 测评预约表
+CREATE TABLE IF NOT EXISTS assessment_appointments (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT COMMENT '用户ID',
+    family_id BIGINT NOT NULL,
+    child_id BIGINT COMMENT '孩子ID',
+    teacher_id BIGINT COMMENT '教师ID',
+    guide_id BIGINT COMMENT '规划师ID',
+    package_id BIGINT COMMENT '套餐ID',
+    appointment_date VARCHAR(20) COMMENT '预约日期 yyyy-MM-dd',
+    appointment_time VARCHAR(20) COMMENT '预约时间 HH:mm',
+    duration_minutes INT COMMENT '测评时长',
+    status TINYINT DEFAULT 0 COMMENT '0=待确认,1=已确认,2=已完成,3=已取消,4=未到',
+    appointment_type VARCHAR(20) DEFAULT 'initial' COMMENT '初测/复测/回访',
+    notes TEXT COMMENT '备注',
+    remark TEXT COMMENT '补充说明',
+    contact_phone VARCHAR(20),
+    meet_link VARCHAR(255) COMMENT '会议链接',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_user_id (user_id),
+    INDEX idx_teacher_id (teacher_id),
+    INDEX idx_guide_id (guide_id),
+    INDEX idx_family_id (family_id),
+    INDEX idx_child_id (child_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- DAN测评结果表
+CREATE TABLE IF NOT EXISTS dan_assessment_results (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL,
+    family_member_id BIGINT COMMENT '家庭成员ID',
+    family_member_name VARCHAR(50) COMMENT '成员姓名快照',
+    family_member_birthday DATE COMMENT '成员出生日期快照',
+    family_member_gender VARCHAR(10) COMMENT '成员性别快照',
+    family_member_age INT COMMENT '成员年龄快照',
+    teacher_id BIGINT NOT NULL,
+    appointment_id BIGINT,
+    attention_score INT COMMENT '注意力得分',
+    focus_score INT COMMENT '专注力得分',
+    memory_score INT COMMENT '记忆力得分',
+    logic_score INT COMMENT '逻辑思维得分',
+    perception_score INT COMMENT '感知得分',
+    spatial_score INT COMMENT '空间思维得分',
+    processing_speed_score INT COMMENT '加工速度得分',
+    emotion_score INT COMMENT '情绪商数(EMI)',
+    resilience_score INT COMMENT '心理韧性(EMI)',
+    stress_coping_score INT COMMENT '压力应对(EMI)',
+    self_awareness_score INT COMMENT '自我认知(EMI)',
+    emotion_management_score INT COMMENT '情绪管理得分(EMI)',
+    empathy_score INT COMMENT '同理心得分(EMI)',
+    social_adaptability_score INT COMMENT '社会适应得分(EMI)',
+    self_motivation_score INT COMMENT '自我激励得分(EMI)',
+    overall_score INT COMMENT '综合得分',
+    openness_score INT COMMENT '开放性(大五人格)',
+    conscientiousness_score INT COMMENT '尽责性(大五人格)',
+    extraversion_score INT COMMENT '外向性(大五人格)',
+    agreeableness_score INT COMMENT '宜人性(大五人格)',
+    neuroticism_score INT COMMENT '神经质(大五人格)',
+    big_five_overall_score INT COMMENT '大五人格综合分',
+    assessment_date DATE NOT NULL,
+    duration_minutes INT COMMENT '测评时长',
+    game_records JSON COMMENT '游戏记录详情',
+    analysis_report TEXT COMMENT '分析报告',
+    growth_suggestions TEXT COMMENT '成长建议',
+    next_review_date DATE COMMENT '下次复测日期',
+    status ENUM('draft', 'completed', 'archived') DEFAULT 'draft',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    -- 孩子快照字段(测评时保存的完整信息)
+    child_name VARCHAR(50) COMMENT '孩子姓名快照',
+    child_birthday DATE COMMENT '出生日期快照',
+    child_gender VARCHAR(10) COMMENT '性别快照',
+    child_age INT COMMENT '年龄快照',
+    school VARCHAR(100) COMMENT '学校快照',
+    grade VARCHAR(20) COMMENT '年级快照',
+    grade_class VARCHAR(20) COMMENT '班级快照',
+    height INT COMMENT '身高(CM)快照',
+    weight INT COMMENT '体重(KG)快照',
+    family_status VARCHAR(50) COMMENT '家庭状况快照',
+    parent_degree VARCHAR(50) COMMENT '父母最高学历快照',
+    nation VARCHAR(20) COMMENT '民族快照',
+    province VARCHAR(50) COMMENT '省快照',
+    city VARCHAR(50) COMMENT '市快照',
+    district VARCHAR(50) COMMENT '区快照',
+    address VARCHAR(200) COMMENT '详细地址快照',
+    single_child VARCHAR(10) COMMENT '是否独生子女快照',
+    school_score VARCHAR(20) COMMENT '在校成绩快照',
+    urgent_name VARCHAR(50) COMMENT '紧急联系人姓名',
+    urgent_phone VARCHAR(20) COMMENT '紧急联系人电话',
+    -- 媒体字段
+    pics TEXT COMMENT '图片IDs',
+    videos TEXT COMMENT '视频IDs',
+    audio VARCHAR(100) COMMENT '音频ID',
+    audio_url VARCHAR(255) COMMENT '音频URL',
+    -- 扩展描述字段
+    process_desc TEXT COMMENT '过程描述',
+    result_desc TEXT COMMENT '结果简评',
+    source VARCHAR(20) DEFAULT 'planner_entry' COMMENT '报告来源: planner_entry/parent_upload/auto_fetch',
+    dimension VARCHAR(10) DEFAULT 'mind' COMMENT '报告维度: mind(心-A2)/wisdom(智-B4)',
+    report_file_id VARCHAR(100) COMMENT '上传文件媒资ID',
+    draft_status VARCHAR(10) DEFAULT 'pending' COMMENT '草稿状态: pending(待确认)/confirmed(已确认)',
+    INDEX idx_child_id (child_id),
+    INDEX idx_teacher_id (teacher_id),
+    INDEX idx_assessment_date (assessment_date)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='DAN测评结果表';
+
+-- 成长规划表
+CREATE TABLE IF NOT EXISTS growth_plans (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL,
+    teacher_id BIGINT NOT NULL,
+    assessment_id BIGINT,
+    plan_title VARCHAR(200) NOT NULL,
+    plan_content TEXT NOT NULL COMMENT '规划内容',
+    duration_months TINYINT COMMENT '规划周期(月)',
+    status ENUM('draft', 'active', 'completed', 'expired') DEFAULT 'draft',
+    start_date DATE,
+    end_date DATE,
+    review_count INT DEFAULT 0 COMMENT '已复盘次数',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_child_id (child_id),
+    INDEX idx_teacher_id (teacher_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- =============================================
+-- 成长档案表
+-- =============================================
+CREATE TABLE IF NOT EXISTS growth_records (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL COMMENT '孩子ID',
+    parent_id BIGINT NOT NULL COMMENT '家长用户ID',
+    assessment_id BIGINT COMMENT '关联的测评结果ID',
+    record_title VARCHAR(200) COMMENT '档案标题',
+    child_age INT COMMENT '孩子当时年龄(月)',
+    height VARCHAR(20) COMMENT '身高',
+    weight VARCHAR(20) COMMENT '体重',
+    assessment_summary TEXT COMMENT '测评摘要',
+    overall_score INT COMMENT '综合得分',
+    growth_suggestions TEXT COMMENT '成长建议',
+    task_recommendations TEXT COMMENT '任务推荐(JSON)',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/completed',
+    external_sync TINYINT DEFAULT 0 COMMENT '是否来自外部系统同步',
+    external_source VARCHAR(100) COMMENT '外部系统来源',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_child_id (child_id),
+    INDEX idx_parent_id (parent_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- =============================================
+-- 数据库迁移(新增字段和表)- 通过Java代码处理
+-- =============================================
+
+-- 注意:ALTER TABLE语句已移到 DatabaseInitializer.java 中执行
+-- 避免重复执行导致的错误
+
+-- 3. 家长心愿单表(新增)
+CREATE TABLE IF NOT EXISTS reward_wishlists (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL COMMENT '创建者用户ID',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    title VARCHAR(100) NOT NULL COMMENT '心愿名称',
+    description TEXT COMMENT '心愿描述',
+    points_required INT NOT NULL COMMENT '所需积分',
+    category VARCHAR(32) COMMENT '分类',
+    image_url VARCHAR(255) COMMENT '图片链接',
+    status ENUM('available', 'pending', 'exchanged', 'rejected') DEFAULT 'available' COMMENT '状态',
+    exchange_approved TINYINT COMMENT '是否审批通过',
+    exchanged_at DATETIME COMMENT '兑换时间',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_user_id (user_id),
+    INDEX idx_family_id (family_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 4. 更新任务状态枚举(如果需要支持更多状态)
+-- ALTER TABLE tasks MODIFY COLUMN status ENUM('pending', 'completed', 'overdue', 'cancelled', 'parent_pending', 'parent_completed') DEFAULT 'pending';
+
+-- ===================== 任务模板套餐功能 =====================
+
+-- 成长规划师-家庭关系表
+CREATE TABLE IF NOT EXISTS guide_families (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    guide_id BIGINT NOT NULL COMMENT '成长规划师用户ID',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    service_type VARCHAR(20) DEFAULT 'consulting' COMMENT '服务类型: monthly/yearly/consulting',
+    service_price INT DEFAULT 0 COMMENT '服务价格(分)',
+    status VARCHAR(20) DEFAULT 'binding' COMMENT '状态: binding/paused/cancelled',
+    bound_at DATETIME COMMENT '绑定时间',
+    expire_at DATETIME COMMENT '服务到期时间',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_guide_family (guide_id, family_id),
+    INDEX idx_guide_id (guide_id),
+    INDEX idx_family_id (family_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 任务模板套餐
+CREATE TABLE IF NOT EXISTS task_template_packages (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    creator_id BIGINT NOT NULL COMMENT '创建者成长规划师ID',
+    name VARCHAR(100) NOT NULL COMMENT '套餐名称',
+    description TEXT COMMENT '详细介绍',
+    cycle_days INT NOT NULL COMMENT '周期天数',
+    category VARCHAR(50) COMMENT '分类',
+    tags JSON COMMENT '标签',
+    price INT DEFAULT 0 COMMENT '售价(分)',
+    platform_fee INT DEFAULT 0 COMMENT '平台服务费(基点)',
+    is_public TINYINT DEFAULT 0 COMMENT '是否公开',
+    share_code VARCHAR(50) UNIQUE COMMENT '分享码',
+    cover_image VARCHAR(500) COMMENT '封面图',
+    status VARCHAR(20) DEFAULT 'draft' COMMENT '状态',
+    reviewer_id BIGINT COMMENT '审核人',
+    reviewed_at DATETIME COMMENT '审核时间',
+    reject_reason TEXT COMMENT '拒绝原因',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_creator_id (creator_id),
+    INDEX idx_status (status),
+    INDEX idx_is_public (is_public)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 套餐内任务项
+CREATE TABLE IF NOT EXISTS task_template_items (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    package_id BIGINT NOT NULL COMMENT '所属套餐ID',
+    task_name VARCHAR(100) NOT NULL,
+    description TEXT,
+    points INT DEFAULT 0,
+    frequency VARCHAR(20) DEFAULT 'daily',
+    duration INT COMMENT '预计时长(分钟)',
+    is_required TINYINT DEFAULT 0,
+    sort_order INT DEFAULT 0,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_package_id (package_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 套餐应用实例
+CREATE TABLE IF NOT EXISTS task_plan_instances (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    package_id BIGINT NOT NULL,
+    family_id BIGINT NOT NULL,
+    child_id BIGINT NOT NULL,
+    name VARCHAR(100) NOT NULL,
+    start_date DATE NOT NULL,
+    end_date DATE NOT NULL,
+    status VARCHAR(20) DEFAULT 'active',
+    total_days INT,
+    completed_days INT DEFAULT 0,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_family_id (family_id),
+    INDEX idx_child_id (child_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 实例任务项
+CREATE TABLE IF NOT EXISTS task_plan_items (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    instance_id BIGINT NOT NULL,
+    template_item_id BIGINT,
+    task_name VARCHAR(100) NOT NULL,
+    description TEXT,
+    points INT DEFAULT 0,
+    frequency VARCHAR(20) DEFAULT 'daily',
+    duration INT,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_instance_id (instance_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 套餐购买订单
+CREATE TABLE IF NOT EXISTS package_orders (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    order_no VARCHAR(32) UNIQUE NOT NULL,
+    user_id BIGINT NOT NULL COMMENT '购买者用户ID',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    package_id BIGINT NOT NULL COMMENT '套餐ID',
+    package_name VARCHAR(100) COMMENT '套餐名称',
+    price INT NOT NULL COMMENT '支付金额(分)',
+    platform_fee INT DEFAULT 0 COMMENT '平台服务费(分)',
+    user_coupon_id BIGINT COMMENT '使用的用户优惠券ID',
+    guide_id BIGINT COMMENT '成长规划师ID',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/paid/cancelled/refunded',
+    pay_method VARCHAR(20) COMMENT '支付方式',
+    transaction_id VARCHAR(64) COMMENT '微信支付订单号',
+    paid_at DATETIME COMMENT '支付时间',
+    notify_data TEXT COMMENT '支付回调数据',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_user_id (user_id),
+    INDEX idx_family_id (family_id),
+    INDEX idx_package_id (package_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 用户表增加成长规划师相关字段 - 已移到 DatabaseInitializer.java 执行
+-- ALTER TABLE users ADD COLUMN teacher_no VARCHAR(50) COMMENT '成长规划师证书号';
+-- ALTER TABLE users ADD COLUMN teacher_photo VARCHAR(500) COMMENT '成长规划师照片';
+-- ALTER TABLE users ADD COLUMN certificate_image VARCHAR(500) COMMENT '成长规划师证书照片';
+-- ALTER TABLE users ADD COLUMN teacher_status VARCHAR(20) DEFAULT 'pending' COMMENT '成长规划师审核状态: pending/approved/rejected';
+-- ALTER TABLE users ADD INDEX idx_teacher_status (teacher_status);
+
+-- 成长规划师咨询消息表
+CREATE TABLE IF NOT EXISTS teacher_messages (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    parent_id BIGINT NOT NULL COMMENT '家长用户ID',
+    teacher_id BIGINT NOT NULL COMMENT '成长规划师用户ID',
+    content TEXT NOT NULL COMMENT '消息内容',
+    reply_content TEXT COMMENT '回复内容',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '状态:pending/replied',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    replied_at DATETIME COMMENT '回复时间',
+    INDEX idx_family_id (family_id),
+    INDEX idx_teacher_id (teacher_id),
+    INDEX idx_parent_id (parent_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 游戏记录表(专注训练模块)
+CREATE TABLE IF NOT EXISTS game_records (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL COMMENT '孩子ID',
+    game_code VARCHAR(20) NOT NULL COMMENT '游戏代码',
+    score INT DEFAULT 0 COMMENT '得分(0-100)',
+    completion_time INT COMMENT '完成用时(秒)',
+    difficulty VARCHAR(20) DEFAULT 'medium' COMMENT '难度(easy/medium/hard)',
+    points_earned INT DEFAULT 0 COMMENT '获得积分',
+    played_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '游玩时间',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_child_id (child_id),
+    INDEX idx_game_code (game_code),
+    INDEX idx_played_at (played_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 勋章定义表
+CREATE TABLE IF NOT EXISTS badge (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    badge_id VARCHAR(50) UNIQUE NOT NULL COMMENT '勋章唯一标识',
+    name VARCHAR(100) NOT NULL COMMENT '勋章名称',
+    description TEXT COMMENT '勋章描述',
+    icon VARCHAR(255) COMMENT '勋章图标',
+    category VARCHAR(20) COMMENT '分类(学习/运动/家务/阅读/打卡/综合)',
+    level VARCHAR(20) COMMENT '等级(铜牌/银牌/金牌/钻石)',
+    rarity VARCHAR(20) COMMENT '稀有度(普通/稀有/史诗/传说)',
+    trigger_type VARCHAR(20) COMMENT '触发类型(task_count/streak_days/points_total/reward_count/custom)',
+    threshold INT DEFAULT 0 COMMENT '阈值',
+    need_approval TINYINT DEFAULT 0 COMMENT '是否需要审批',
+    expire_days INT DEFAULT -1 COMMENT '有效期天数(-1永久)',
+    sort_order INT DEFAULT 0 COMMENT '排序',
+    is_active TINYINT DEFAULT 1 COMMENT '是否启用',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_category (category),
+    INDEX idx_is_active (is_active)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 儿童勋章关联表
+CREATE TABLE IF NOT EXISTS child_badge (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL COMMENT '孩子ID',
+    badge_id BIGINT NOT NULL COMMENT '勋章ID',
+    earned_at DATETIME COMMENT '获得时间',
+    expire_at DATETIME COMMENT '过期时间',
+    status TINYINT DEFAULT 1 COMMENT '状态:1有效 0过期 -1撤销',
+    is_favorite TINYINT DEFAULT 0 COMMENT '是否收藏',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_child_badge (child_id, badge_id),
+    INDEX idx_child_id (child_id),
+    INDEX idx_badge_id (badge_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- =============================================
+-- 以下表从 DatabaseInitializer.java 提取
+-- 管理后台表
+-- =============================================
+
+-- 管理员表
+CREATE TABLE IF NOT EXISTS admins (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    username VARCHAR(50) NOT NULL COMMENT '用户名',
+    password VARCHAR(128) NOT NULL COMMENT '密码(MD5加密)',
+    nickname VARCHAR(50) COMMENT '昵称',
+    real_name VARCHAR(50) COMMENT '真实姓名',
+    phone VARCHAR(11) COMMENT '手机号',
+    email VARCHAR(100) COMMENT '邮箱',
+    role VARCHAR(20) DEFAULT 'admin' COMMENT '角色: admin/teacher',
+    status TINYINT DEFAULT 1 COMMENT '状态:1启用0禁用',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_phone (phone),
+    INDEX idx_username (username)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='管理员表';
+
+-- 验证码表
+CREATE TABLE IF NOT EXISTS verification_codes (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    phone VARCHAR(11) NOT NULL COMMENT '手机号',
+    code VARCHAR(6) NOT NULL COMMENT '验证码',
+    type VARCHAR(20) NOT NULL COMMENT '验证码类型',
+    expires_in INT DEFAULT 300 COMMENT '过期时间(秒)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    expires_at DATETIME NOT NULL COMMENT '过期时间',
+    used TINYINT DEFAULT 0 COMMENT '是否已使用:0否1是',
+    INDEX idx_phone_type (phone, type),
+    INDEX idx_expires_at (expires_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='验证码表';
+
+-- 管理后台任务模板表
+CREATE TABLE IF NOT EXISTS admin_task_templates (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    title VARCHAR(200) NOT NULL COMMENT '模板标题',
+    description TEXT COMMENT '模板描述',
+    points INT DEFAULT 10 COMMENT '默认积分',
+    category VARCHAR(32) COMMENT '任务分类',
+    need_review TINYINT DEFAULT 0 COMMENT '是否需要审核:0否1是',
+    review_by_category TINYINT DEFAULT 0 COMMENT '是否按分类审核:0否1是',
+    recommended_age INT COMMENT '推荐年龄',
+    difficulty ENUM('easy', 'medium', 'hard') DEFAULT 'medium' COMMENT '难度: easy/medium/hard',
+    teacher_id BIGINT COMMENT '成长规划师ID',
+    complete_types VARCHAR(100) COMMENT '完成方式JSON',
+    duration INT COMMENT '预计完成时长(分钟)',
+    review_type VARCHAR(20) COMMENT '审核人类型: creator/parent/teacher/ai',
+    task_type VARCHAR(20) COMMENT '任务性质: onetime/recurring',
+    frequency VARCHAR(20) COMMENT '频率: daily/weekly/monthly',
+    max_frequency INT COMMENT '周期内最多完成次数',
+    is_active TINYINT DEFAULT 1 COMMENT '是否启用:0禁用1启用',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_category (category),
+    INDEX idx_difficulty (difficulty),
+    INDEX idx_is_active (is_active)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='管理后台任务模板表';
+
+-- =============================================
+-- 测评模块表
+-- =============================================
+
+-- 测评资料表
+-- 数学闯关 - 孩子当前等级
+CREATE TABLE IF NOT EXISTS math_child_level (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL UNIQUE,
+    current_level TINYINT NOT NULL DEFAULT 1 COMMENT '1=一位数加减,2=两位数加减,3=一位数四则,4=两位数四则',
+    total_passed INT DEFAULT 0 COMMENT '累计通关次数',
+    best_time_ms BIGINT DEFAULT NULL COMMENT '最佳用时(毫秒)',
+    best_accuracy INT DEFAULT NULL COMMENT '最佳正确率(%)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_child_id (child_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- 数学闯关 - 通关日志
+CREATE TABLE IF NOT EXISTS math_quiz_logs (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT NOT NULL,
+    level TINYINT NOT NULL COMMENT '闯关时等级',
+    target_n INT NOT NULL COMMENT '目标连续答对数',
+    correct_count INT NOT NULL COMMENT '实际连续答对数',
+    total_attempts INT NOT NULL COMMENT '总答题数',
+    total_time_ms BIGINT NOT NULL COMMENT '总用时(毫秒)',
+    accuracy INT NOT NULL COMMENT '正确率(%)',
+    passed TINYINT(1) DEFAULT 0 COMMENT '是否通关',
+    exprs TEXT COMMENT '本轮表达式列表(JSON)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_child_id (child_id),
+    INDEX idx_level (level)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+CREATE TABLE IF NOT EXISTS assessment_materials (
+    id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键',
+    title VARCHAR(100) NOT NULL COMMENT '资料标题',
+    content TEXT COMMENT '测评介绍内容',
+    cover_image VARCHAR(255) COMMENT '封面图片',
+    status VARCHAR(20) DEFAULT 'active' COMMENT '状态:active/inactive',
+    created_at DATETIME COMMENT '创建时间',
+    updated_at DATETIME COMMENT '更新时间',
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='测评资料表';
+
+-- 积分配置表
+CREATE TABLE IF NOT EXISTS assessment_points_config (
+    id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键',
+    points_value INT DEFAULT 100 COMMENT '完成测评获得积分',
+    points_value_yuan INT DEFAULT 1 COMMENT '1积分等于多少分(原元→现分)',
+    is_active TINYINT DEFAULT 1 COMMENT '是否启用',
+    created_at DATETIME COMMENT '创建时间',
+    updated_at DATETIME COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='积分配置表';
+
+-- 家庭测评配置表
+CREATE TABLE IF NOT EXISTS family_assessment_config (
+    id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    material_id BIGINT COMMENT '测评资料ID',
+    remind_months INT DEFAULT 12 COMMENT '提醒周期(月)',
+    last_remind_at DATETIME COMMENT '上次提醒时间',
+    next_remind_at DATETIME COMMENT '下次提醒时间',
+    is_enabled TINYINT DEFAULT 1 COMMENT '是否启用:1启用0关闭',
+    created_by BIGINT COMMENT '创建人(规划师ID)',
+    created_at DATETIME COMMENT '创建时间',
+    updated_at DATETIME COMMENT '更新时间',
+    UNIQUE KEY uk_family (family_id),
+    INDEX idx_next_remind (next_remind_at),
+    INDEX idx_enabled (is_enabled)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭测评配置表';
+
+-- 测评记录表
+CREATE TABLE IF NOT EXISTS assessment_records (
+    id BIGINT PRIMARY KEY AUTO_INCREMENT COMMENT '主键',
+    family_id BIGINT COMMENT '家庭ID',
+    child_id BIGINT COMMENT '孩子ID',
+    material_id BIGINT COMMENT '测评资料ID',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '状态:pending待完成/completed已完成',
+    completed_at DATETIME COMMENT '完成时间',
+    created_at DATETIME COMMENT '创建时间',
+    INDEX idx_family (family_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='测评记录表';
+
+-- 评估订单表(测评订单)
+CREATE TABLE IF NOT EXISTS assessment_orders (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    order_no VARCHAR(64) NOT NULL UNIQUE COMMENT '订单编号',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    child_id BIGINT COMMENT '孩子ID',
+    guide_id BIGINT NOT NULL COMMENT '成长规划师ID',
+    package_id BIGINT NOT NULL COMMENT '套餐ID',
+    appointment_id BIGINT COMMENT '关联预约ID',
+    guide_name VARCHAR(50) COMMENT '规划师名称',
+    package_name VARCHAR(100) COMMENT '套餐名称',
+    total_price BIGINT DEFAULT 0 COMMENT '总价(分)',
+    discount_amount BIGINT DEFAULT 0 COMMENT '优惠金额(分)',
+    actual_price BIGINT DEFAULT 0 COMMENT '实付金额(分)',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/paid/completed/cancelled/refunded',
+    pay_time VARCHAR(50) COMMENT '支付时间',
+    pay_type VARCHAR(20) COMMENT '支付方式',
+    transaction_id VARCHAR(64) COMMENT '交易流水号',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_family (family_id),
+    INDEX idx_guide (guide_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='评估订单表';
+
+-- =============================================
+-- 成长规划师相关表
+-- =============================================
+
+-- 成长规划师申请表
+CREATE TABLE IF NOT EXISTS guide_applications (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT NOT NULL COMMENT '申请人用户ID',
+    type VARCHAR(20) NOT NULL DEFAULT 'new_apply' COMMENT '申请类型: new_apply-新注册, upgrade-升级',
+    target_level VARCHAR(20) NOT NULL COMMENT '目标等级: junior-初级, intermediate-中级, senior-高级',
+    current_level VARCHAR(20) DEFAULT NULL COMMENT '当前等级(升级时填写)',
+    package_id BIGINT COMMENT '申请的套餐ID',
+    payment_proof VARCHAR(500) COMMENT '付款凭证URL',
+    payment_amount INT COMMENT '付款金额(分)',
+    address VARCHAR(500) COMMENT '地址',
+    bank_card VARCHAR(50) COMMENT '银行卡号',
+    bank_name VARCHAR(100) COMMENT '开户行',
+    status VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT '状态: pending-待审核, approved-已通过, rejected-已拒绝',
+    reject_reason TEXT COMMENT '拒绝原因',
+    reviewed_at DATETIME COMMENT '审核时间',
+    reviewed_by BIGINT COMMENT '审核人ID',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_user_id (user_id),
+    INDEX idx_status (status),
+    INDEX idx_type (type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成长规划师申请表';
+
+-- 成长规划师申请过程记录表
+CREATE TABLE IF NOT EXISTS guide_application_records (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    application_id BIGINT NOT NULL COMMENT '关联申请ID',
+    user_id BIGINT NOT NULL COMMENT '操作人用户ID',
+    action VARCHAR(50) NOT NULL COMMENT '操作: submit/approve/reject/withdraw/resubmit',
+    from_status VARCHAR(20) COMMENT '操作前状态',
+    to_status VARCHAR(20) NOT NULL COMMENT '操作后状态',
+    remark TEXT COMMENT '备注/原因',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_application_id (application_id),
+    INDEX idx_user_id (user_id),
+    INDEX idx_action (action)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成长规划师申请过程记录表';
+
+-- =============================================
+-- 小游戏表
+-- =============================================
+
+-- 小游戏表
+CREATE TABLE IF NOT EXISTS mini_games (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    game_code VARCHAR(20) NOT NULL UNIQUE COMMENT '游戏代码',
+    game_name VARCHAR(50) NOT NULL COMMENT '游戏名称',
+    description TEXT COMMENT '游戏描述',
+    icon VARCHAR(50) COMMENT '图标emoji',
+    default_duration INT DEFAULT 5 COMMENT '默认时长(分钟)',
+    default_points INT DEFAULT 5 COMMENT '默认奖励积分',
+    game_url VARCHAR(255) COMMENT '游戏H5页面URL',
+    sort_order INT DEFAULT 0 COMMENT '排序',
+    status TINYINT DEFAULT 1 COMMENT '状态:0禁用1启用',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_game_code (game_code),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='小游戏表';
+
+-- =============================================
+-- 地址维度表
+-- =============================================
+
+-- 街道地址维度表
+CREATE TABLE IF NOT EXISTS streets (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    province VARCHAR(50) COMMENT '省份',
+    province_code VARCHAR(20) COMMENT '省份编码',
+    city VARCHAR(50) COMMENT '城市',
+    city_code VARCHAR(20) COMMENT '城市编码',
+    district VARCHAR(50) COMMENT '区县',
+    district_code VARCHAR(20) COMMENT '区县编码',
+    street VARCHAR(100) COMMENT '街道',
+    street_code VARCHAR(20) COMMENT '街道编码',
+    full_name VARCHAR(200) COMMENT '完整地址',
+    level INT COMMENT '层级:1省2市3区4街道',
+    parent_id BIGINT COMMENT '父级ID',
+    sort_order INT DEFAULT 0 COMMENT '排序',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_level (level),
+    INDEX idx_parent_id (parent_id),
+    INDEX idx_street_code (street_code),
+    INDEX idx_full_name (full_name(50))
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='街道地址维度表';
+
+-- =============================================
+-- 系统日志表
+-- =============================================
+
+-- 用户操作日志表
+CREATE TABLE IF NOT EXISTS user_operation_logs (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT COMMENT '用户ID',
+    nickname VARCHAR(50) COMMENT '用户昵称',
+    operation_type VARCHAR(20) NOT NULL COMMENT '操作类型: login/logout/create/update/delete/query等',
+    description TEXT COMMENT '操作描述',
+    request_path VARCHAR(200) COMMENT '请求路径',
+    request_method VARCHAR(10) COMMENT '请求方法',
+    request_params TEXT COMMENT '请求参数(脱敏)',
+    response_status INT COMMENT '响应状态码',
+    client_ip VARCHAR(50) COMMENT '客户端IP',
+    user_agent VARCHAR(500) COMMENT 'User-Agent',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_user_id (user_id),
+    INDEX idx_operation_type (operation_type),
+    INDEX idx_created_at (created_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户操作日志表';
+
+-- =============================================
+-- 邀请与心愿表
+-- =============================================
+
+-- 邀请卡片表
+CREATE TABLE IF NOT EXISTS invite_card (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    type VARCHAR(20) NOT NULL COMMENT '类型: child/family/guide',
+    code VARCHAR(64) NOT NULL UNIQUE COMMENT '邀请码',
+    ref_id BIGINT NOT NULL COMMENT '关联ID(childId/familyId)',
+    creator_id BIGINT NOT NULL COMMENT '创建人',
+    expires_at DATETIME NOT NULL COMMENT '过期时间',
+    used TINYINT DEFAULT 0 COMMENT '是否已使用:0否1是',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_code (code),
+    INDEX idx_ref_type (ref_id, type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='邀请卡片表';
+
+-- 心愿单表
+CREATE TABLE IF NOT EXISTS wishes (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    family_id BIGINT COMMENT '家庭ID',
+    child_id BIGINT COMMENT '目标孩子ID',
+    created_by BIGINT COMMENT '创建者用户ID',
+    creator_type VARCHAR(20) COMMENT '创建者类型: child/parent',
+    title VARCHAR(200) NOT NULL COMMENT '心愿标题',
+    description TEXT COMMENT '心愿描述',
+    category VARCHAR(32) COMMENT '心愿分类',
+    points_required INT COMMENT '所需积分',
+    points_set_by BIGINT COMMENT '定价者ID',
+    points_set_at DATETIME COMMENT '定价时间',
+    status VARCHAR(32) DEFAULT 'active' COMMENT '状态: draft/active/pending_exchange/approved/exchanging/fulfilled/cancelled/rejected',
+    exchange_requested_at DATETIME COMMENT '申请兑换时间',
+    exchange_approved_by BIGINT COMMENT '批准者ID',
+    exchange_approved_at DATETIME COMMENT '批准时间',
+    points_deducted_at DATETIME COMMENT '扣积分时间',
+    fulfilled_by BIGINT COMMENT '兑现者ID',
+    fulfilled_at DATETIME COMMENT '兑现时间',
+    child_confirmed_at DATETIME COMMENT '孩子确认收货时间',
+    rejected_by BIGINT COMMENT '拒绝者ID',
+    rejected_at DATETIME COMMENT '拒绝时间',
+    reject_reason TEXT COMMENT '拒绝原因',
+    reject_count INT DEFAULT 0 COMMENT '被拒绝次数',
+    cancelled_by BIGINT COMMENT '取消者ID',
+    cancelled_at DATETIME COMMENT '取消时间',
+    cancel_reason TEXT COMMENT '取消原因',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_family_id (family_id),
+    INDEX idx_child_id (child_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='心愿单表';
+
+-- =============================================
+-- 商品与订单表
+-- =============================================
+
+-- 商品表
+CREATE TABLE IF NOT EXISTS products (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    name VARCHAR(200) NOT NULL COMMENT '商品名称',
+    description TEXT COMMENT '商品描述',
+    intro TEXT COMMENT '详细介绍',
+    cover_image VARCHAR(500) COMMENT '封面图片',
+    images TEXT COMMENT '多张图片JSON',
+    price INT NOT NULL DEFAULT 0 COMMENT '价格(分)',
+    stock INT NOT NULL DEFAULT 0 COMMENT '库存',
+    sales_count INT NOT NULL DEFAULT 0 COMMENT '销量',
+    product_type VARCHAR(32) NOT NULL COMMENT '商品类型: activity/course/physical/digital/service',
+    vendor_id BIGINT COMMENT '供应商ID',
+    vendor_name VARCHAR(100) COMMENT '供应商名称',
+    status VARCHAR(32) NOT NULL DEFAULT 'draft' COMMENT '状态: draft/pending/approved/rejected/on_shelf/off_shelf',
+    reject_reason TEXT COMMENT '审核拒绝原因',
+    member_price INT COMMENT '会员价(分)',
+    member_eligible VARCHAR(32) DEFAULT 'none' COMMENT '会员资格: all/budget/none',
+    domain VARCHAR(32) COMMENT '五维领域: action/mind/body/wisdom/wealth',
+    dimension_weights TEXT COMMENT '五维能量权重JSON',
+    profit_rate INT DEFAULT 0 COMMENT '平台利润率(千分比)',
+    delivery_method TINYINT DEFAULT 1 COMMENT '配送方式: 1=快递 2=自提 3=两者皆可',
+    category_id BIGINT COMMENT '商品类目ID',
+    distribution_system_id BIGINT COMMENT '销售体系ID',
+    external_source VARCHAR(64) COMMENT '外部来源系统',
+    external_id VARCHAR(128) COMMENT '外部来源ID',
+    external_data TEXT COMMENT '外部来源数据JSON',
+    has_sku TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否启用多SKU:0统一价 1多规格',
+    sku_spec_names JSON DEFAULT NULL COMMENT '规格维度名:如["颜色","尺寸"]',
+    delivery_methods TINYINT(1) DEFAULT 3 COMMENT '配送方式支持:1仅快递 2仅自提 3都支持',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品表';
+
+-- 商品订单表
+CREATE TABLE IF NOT EXISTS product_orders (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    order_no VARCHAR(64) NOT NULL UNIQUE COMMENT '订单编号',
+    product_id BIGINT NOT NULL COMMENT '商品ID',
+    product_name VARCHAR(200) COMMENT '商品名称',
+    product_type VARCHAR(32) COMMENT '商品类型',
+    buyer_id BIGINT NOT NULL COMMENT '购买者ID',
+    family_id BIGINT COMMENT '家庭ID',
+    quantity INT NOT NULL DEFAULT 1 COMMENT '数量',
+    unit_price INT NOT NULL COMMENT '单价(分)',
+    total_amount INT NOT NULL COMMENT '总金额(分)',
+    status VARCHAR(32) NOT NULL DEFAULT 'pending' COMMENT '状态: pending/paid/completed/cancelled/refunded',
+    payment_method VARCHAR(32) COMMENT '支付方式: wechat/points/membership',
+    remark TEXT COMMENT '备注',
+    paid_at DATETIME COMMENT '支付时间',
+    supply_system_id BIGINT COMMENT '所属供应商体系ID',
+    supplier_id BIGINT COMMENT '收款供应商用户ID',
+    supply_commission INT COMMENT '销售佣金(分)',
+    points_used INT DEFAULT 0 COMMENT '使用的积分数量',
+    points_cost INT DEFAULT 0 COMMENT '积分抵扣金额(分)',
+    money_amount INT DEFAULT 0 COMMENT '现金支付金额(分)',
+    consignee_id BIGINT COMMENT '收货人ID',
+    purchase_info TEXT COMMENT '购买信息JSON: {id_card, hand_signature, ...}',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_user_id (user_id),
+    INDEX idx_family_id (family_id),
+    INDEX idx_product_id (product_id),
+    INDEX idx_status (status),
+    INDEX idx_supply_system_id (supply_system_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品订单表';
+
+-- =============================================
+-- 系统配置与内容表
+-- =============================================
+
+-- 系统配置表
+CREATE TABLE IF NOT EXISTS sys_config (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    config_key VARCHAR(64) NOT NULL UNIQUE COMMENT '配置键',
+    config_value TEXT COMMENT '配置值',
+    description TEXT COMMENT '配置说明',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统配置表';
+
+-- 内容区块配置表
+CREATE TABLE IF NOT EXISTS content_sections (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    page_key VARCHAR(50) NOT NULL COMMENT '页面标识',
+    section_key VARCHAR(50) NOT NULL COMMENT '区块标识',
+    title VARCHAR(100) COMMENT '区块标题',
+    allowed_roles VARCHAR(255) DEFAULT '["anonymous"]' COMMENT '允许查看的角色JSON数组',
+    sort_order INT DEFAULT 0 COMMENT '显示顺序',
+    status VARCHAR(20) DEFAULT 'active' COMMENT '状态: active/inactive',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='内容区块配置表';
+
+-- 文章分类表
+CREATE TABLE IF NOT EXISTS article_categories (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    name VARCHAR(50) NOT NULL COMMENT '分类名',
+    icon VARCHAR(20) DEFAULT '' COMMENT '图标emoji',
+    color VARCHAR(20) DEFAULT '#5B9BD5' COMMENT '标识色',
+    sort_order INT DEFAULT 0 COMMENT '排序',
+    status TINYINT DEFAULT 1 COMMENT '状态:1启用/0禁用'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文章分类表';
+
+-- 文章表
+CREATE TABLE IF NOT EXISTS articles (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键 ID',
+    category_id BIGINT DEFAULT 0 COMMENT '所属分类 ID',
+    title VARCHAR(200) NOT NULL COMMENT '标题',
+    summary TEXT DEFAULT '' COMMENT '摘要',
+    cover_image VARCHAR(500) DEFAULT '' COMMENT '封面图 URL',
+    content LONGTEXT COMMENT '富文本内容',
+    tags VARCHAR(200) DEFAULT '' COMMENT '标签 JSON 数组',
+    author VARCHAR(100) DEFAULT '浠艾福' COMMENT '作者',
+    read_time INT DEFAULT 0 COMMENT '预计阅读分钟数',
+    article_type VARCHAR(20) DEFAULT 'normal' COMMENT '文章类型:normal(普通)/premium(优质)/original(原创)',
+    content_type VARCHAR(20) DEFAULT 'text' COMMENT '内容格式:text/html/markdown',
+    difficulty_level INT DEFAULT 0 COMMENT '难度等级:1-5',
+    word_count INT DEFAULT 0 COMMENT '文章字数',
+    dimension_ids VARCHAR(100) DEFAULT '' COMMENT '关联维度IDs JSON',
+    related_dimensions VARCHAR(100) DEFAULT '' COMMENT '关联五维 JSON 数组',
+    dimension_weights TEXT COMMENT '五维能量权重 JSON',
+    visibility VARCHAR(20) DEFAULT 'public' COMMENT '浏览权限:public/login/private',
+    visible_to TEXT COMMENT '私密指定人群 JSON',
+    status VARCHAR(20) DEFAULT 'draft' COMMENT '状态:draft/published/archived',
+    is_featured TINYINT DEFAULT 0 COMMENT '是否精选:1 精选/0 普通',
+    published_at DATETIME DEFAULT NULL COMMENT '发布时间',
+    view_count INT DEFAULT 0 COMMENT '浏览次数',
+    created_by BIGINT DEFAULT 0 COMMENT '发布人 adminID',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文章表';
+
+-- Article audit fields (for user-generated content)
+ALTER TABLE articles
+    ADD COLUMN author_type VARCHAR(20) DEFAULT 'admin' COMMENT '作者类型:admin/parent/child' AFTER created_by,
+    ADD COLUMN audit_status VARCHAR(20) DEFAULT 'approved' COMMENT '审核状态:approved/pending/rejected' AFTER status,
+    ADD COLUMN audit_reason TEXT COMMENT '驳回原因' AFTER audit_status,
+    ADD COLUMN auditor_id BIGINT DEFAULT 0 COMMENT '审核人 ID' AFTER audit_reason,
+    ADD COLUMN audited_at DATETIME COMMENT '审核时间' AFTER auditor_id;
+
+-- =============================================
+-- 五维能量系统表
+-- =============================================
+
+-- 能量维度定义表
+CREATE TABLE IF NOT EXISTS energy_dimension (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    code VARCHAR(16) NOT NULL UNIQUE COMMENT '维度代码: body/mind/wisdom/action/wealth',
+    name VARCHAR(20) NOT NULL COMMENT '维度名称: 身/心/智/行/富',
+    icon VARCHAR(16) COMMENT '图标emoji',
+    element VARCHAR(10) COMMENT '五行元素: 土/火/金/木/水',
+    sort_order INT DEFAULT 0 COMMENT '显示顺序',
+    status TINYINT DEFAULT 1 COMMENT '状态:1启用/0禁用',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='能量维度定义表';
+
+-- 服务-维度比例配置表
+CREATE TABLE IF NOT EXISTS energy_source_config (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    source_type VARCHAR(32) NOT NULL COMMENT '来源类型: task/activity/course/product/consultation',
+    source_id BIGINT NOT NULL COMMENT '来源业务表ID',
+    source_name VARCHAR(200) COMMENT '冗余名称',
+    dimension_id BIGINT NOT NULL COMMENT '维度ID',
+    ratio INT NOT NULL COMMENT '占比(基点,6000=60%)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_source (source_type, source_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务-维度比例配置表';
+
+-- 能量流水表
+CREATE TABLE IF NOT EXISTS energy_log (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    child_id BIGINT NOT NULL COMMENT '孩子ID',
+    dimension_id BIGINT NOT NULL COMMENT '维度ID',
+    amount INT NOT NULL COMMENT '变动量(正=获得,负=消耗)',
+    balance_after INT NOT NULL COMMENT '变动后余额',
+    source_type VARCHAR(32) COMMENT '来源类型: task/product/medical_report/daily_record',
+    source_id BIGINT COMMENT '来源ID',
+    ref_id BIGINT COMMENT '关联旧流水ID(覆盖时标记)',
+    expires_at DATETIME COMMENT '过期时间(空=永不过期)',
+    description TEXT COMMENT '描述',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_child_dim (child_id, dimension_id),
+    INDEX idx_created (created_at),
+    INDEX idx_source (source_type, source_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='能量流水表';
+
+-- 维度余额表
+CREATE TABLE IF NOT EXISTS energy_balance (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    child_id BIGINT NOT NULL COMMENT '孩子ID',
+    dimension_id BIGINT NOT NULL COMMENT '维度ID',
+    balance INT DEFAULT 0 COMMENT '当前能量值(可为负)',
+    total_earned INT DEFAULT 0 COMMENT '累计获得',
+    total_spent INT DEFAULT 0 COMMENT '累计消耗',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    UNIQUE KEY uk_child_dim (child_id, dimension_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='维度余额表';
+
+-- =============================================
+-- 佣金系统表
+-- =============================================
+
+-- 佣金记录表
+CREATE TABLE IF NOT EXISTS commission_records (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    order_id BIGINT NOT NULL COMMENT '订单ID',
+    order_type VARCHAR(32) NOT NULL COMMENT '订单类型: membership/product/assessment/package',
+    referrer_id BIGINT NOT NULL COMMENT '推荐人ID',
+    buyer_id BIGINT NOT NULL COMMENT '购买人ID',
+    commission_type VARCHAR(16) NOT NULL COMMENT '佣金类型: member/profit',
+    level INT DEFAULT 1 COMMENT '佣金层级: 1=直接推荐, 2=间接推荐',
+    order_amount INT NOT NULL COMMENT '订单金额(分)',
+    profit_rate INT DEFAULT 0 COMMENT '利润率(千分比,如235=23.5%)',
+    commission_amount INT NOT NULL COMMENT '佣金金额(分)',
+    status VARCHAR(16) NOT NULL DEFAULT 'settled' COMMENT '状态: pending/settled',
+    remark TEXT DEFAULT NULL COMMENT '备注',
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    family_id BIGINT DEFAULT NULL COMMENT '归属家庭ID',
+    settled_at DATETIME DEFAULT NULL COMMENT '结算时间',
+    withdrawn_at DATETIME DEFAULT NULL COMMENT '提现时间',
+    INDEX idx_referrer (referrer_id),
+    INDEX idx_buyer (buyer_id),
+    INDEX idx_family (family_id),
+    INDEX idx_order (order_id, order_type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='佣金记录表';
+
+-- 提现申请表
+CREATE TABLE IF NOT EXISTS withdrawal_requests (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    amount INT NOT NULL COMMENT '提现金额(分)',
+    account_info TEXT COMMENT '账户信息(JSON)',
+    status VARCHAR(16) NOT NULL DEFAULT 'pending' COMMENT '状态: pending/approved/rejected',
+    audit_by BIGINT DEFAULT NULL COMMENT '审核人ID',
+    audit_at DATETIME DEFAULT NULL COMMENT '审核时间',
+    remark TEXT DEFAULT NULL COMMENT '审核备注',
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_user (user_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='提现申请表';
+
+-- 会员升级记录表
+CREATE TABLE IF NOT EXISTS member_upgrade_records (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    from_level VARCHAR(20) NOT NULL COMMENT '升级前等级',
+    to_level VARCHAR(20) NOT NULL COMMENT '升级后等级',
+    upgrade_type VARCHAR(20) NOT NULL COMMENT '升级类型: pay/consumption/admin',
+    order_id BIGINT DEFAULT NULL COMMENT '关联支付订单ID',
+    consumption_amount BIGINT DEFAULT NULL COMMENT '触发升级的累计消费金额',
+    expire_time DATETIME DEFAULT NULL COMMENT '家庭会员到期时间',
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_user (user_id),
+    INDEX idx_order (order_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='会员升级记录表';
+
+-- =============================================
+-- 规划师服务模块表
+-- =============================================
+
+-- 服务类型表
+CREATE TABLE IF NOT EXISTS service_types (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    name VARCHAR(100) NOT NULL COMMENT '类型名称',
+    icon VARCHAR(50) COMMENT '图标',
+    description TEXT COMMENT '描述',
+    sort_order INT DEFAULT 0 COMMENT '排序',
+    status VARCHAR(20) DEFAULT 'ACTIVE' COMMENT '状态: ACTIVE/DISABLED',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务类型表';
+
+-- 服务内容表
+CREATE TABLE IF NOT EXISTS service_contents (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    type_id BIGINT NOT NULL COMMENT '关联服务类型',
+    title VARCHAR(200) NOT NULL COMMENT '内容标题',
+    content TEXT COMMENT '富文本内容',
+    duration INT COMMENT '建议时长(分钟)',
+    age_range VARCHAR(50) COMMENT '适用年龄',
+    price INT COMMENT '参考价格(分)',
+    status VARCHAR(20) DEFAULT 'DRAFT' COMMENT '状态: DRAFT/ACTIVE',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务内容表';
+
+-- 套餐模板表
+CREATE TABLE IF NOT EXISTS guide_package_templates (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    name VARCHAR(100) NOT NULL COMMENT '模板名称',
+    validity_months INT COMMENT '有效期(月)',
+    reference_price INT COMMENT '参考价格(分)',
+    min_price INT COMMENT '最低售价(分)',
+    description TEXT COMMENT '说明',
+    status VARCHAR(20) DEFAULT 'ACTIVE' COMMENT '状态: ACTIVE/DISABLED',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='套餐模板表';
+
+-- 套餐模板服务项表
+CREATE TABLE IF NOT EXISTS package_template_services (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    template_id BIGINT NOT NULL COMMENT '关联模板',
+    content_id BIGINT NOT NULL COMMENT '关联服务内容',
+    quantity INT DEFAULT 1 COMMENT '数量',
+    unit VARCHAR(20) COMMENT '单位'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='套餐模板服务项表';
+
+-- 成长规划师套餐表
+CREATE TABLE IF NOT EXISTS guide_packages (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    guide_id BIGINT COMMENT '成长规划师ID',
+    package_id BIGINT COMMENT '关联模板',
+    commission_rate INT COMMENT '佣金比例(基点,1000=10%)',
+    teacher_id BIGINT COMMENT '成长规划师ID(旧字段)',
+    template_id BIGINT COMMENT '关联模板(旧字段)',
+    name VARCHAR(100) NOT NULL COMMENT '套餐名称',
+    level VARCHAR(20) COMMENT '套餐等级',
+    price INT NOT NULL COMMENT '销售价格(分)',
+    validity_months INT COMMENT '有效期(月)',
+    validity_days INT DEFAULT 0 COMMENT '有效期天数',
+    description TEXT COMMENT '套餐说明',
+    status VARCHAR(20) DEFAULT 'DRAFT' COMMENT '状态: DRAFT/PUBLISHED/PAUSED',
+    sort_order INT DEFAULT 0 COMMENT '排序',
+    sales_count INT DEFAULT 0 COMMENT '销量',
+    share_code VARCHAR(50) COMMENT '分享码',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成长规划师套餐表';
+
+-- 成长规划师套餐服务项表
+CREATE TABLE IF NOT EXISTS guide_package_services (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    package_id BIGINT NOT NULL COMMENT '关联套餐',
+    content_id BIGINT NOT NULL COMMENT '关联服务内容',
+    quantity INT DEFAULT 1 COMMENT '数量',
+    unit VARCHAR(20) COMMENT '单位'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成长规划师套餐服务项表';
+
+-- 成长规划师订单表
+CREATE TABLE IF NOT EXISTS guide_orders (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    order_no VARCHAR(50) NOT NULL COMMENT '订单号',
+    teacher_id BIGINT NOT NULL COMMENT '成长规划师ID',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    package_id BIGINT NOT NULL COMMENT '套餐ID',
+    amount INT NOT NULL COMMENT '金额(分)',
+    status VARCHAR(20) DEFAULT 'PENDING' COMMENT '状态: PENDING/PAID/COMPLETED/REFUNDED',
+    pay_time DATETIME COMMENT '支付时间',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成长规划师订单表';
+
+-- 佣金明细表
+CREATE TABLE IF NOT EXISTS guide_commissions (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    teacher_id BIGINT NOT NULL COMMENT '成长规划师ID',
+    order_id BIGINT NOT NULL COMMENT '订单ID',
+    amount INT NOT NULL COMMENT '佣金金额(分)',
+    rate INT COMMENT '佣金比例(基点)',
+    status VARCHAR(20) DEFAULT 'PENDING' COMMENT '状态: PENDING/COMPLETED',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='佣金明细表';
+
+-- 服务记录表
+CREATE TABLE IF NOT EXISTS guide_service_logs (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    teacher_id BIGINT NOT NULL COMMENT '成长规划师ID',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    order_id BIGINT COMMENT '订单ID',
+    service_content_id BIGINT NOT NULL COMMENT '服务内容ID',
+    notes TEXT COMMENT '服务记录',
+    duration INT COMMENT '服务时长(分钟)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务记录表';
+
+-- 成长规划师邀请码表
+CREATE TABLE IF NOT EXISTS guide_invite_codes (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    guide_id BIGINT NOT NULL COMMENT '成长规划师用户ID',
+    code VARCHAR(50) NOT NULL UNIQUE COMMENT '邀请码',
+    status VARCHAR(20) DEFAULT 'active' COMMENT '状态',
+    used_by_user_id BIGINT COMMENT '使用该邀请码的用户ID',
+    used_at DATETIME COMMENT '使用时间',
+    expire_at DATETIME COMMENT '过期时间',
+    use_count INT DEFAULT 0 COMMENT '使用次数',
+    max_use_count INT COMMENT '最大使用次数',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成长规划师邀请码表';
+
+-- =============================================
+-- 财富维度表
+-- =============================================
+
+-- 财商打卡记录表
+CREATE TABLE IF NOT EXISTS finance_checkins (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    child_id BIGINT NOT NULL COMMENT '孩子ID',
+    checkin_type VARCHAR(20) NOT NULL COMMENT '打卡类型: daily_plan/saving/expense/review',
+    checkin_date DATE NOT NULL COMMENT '打卡日期',
+    amount INT COMMENT '金额(分,收支记录)',
+    category VARCHAR(50) COMMENT '收支分类',
+    note TEXT COMMENT '备注',
+    mood VARCHAR(20) COMMENT '心情',
+    earned_energy INT DEFAULT 0 COMMENT '获得的能量值',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_user_date (user_id, checkin_date),
+    INDEX idx_child (child_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='财商打卡记录表';
+
+-- 保单管理表
+CREATE TABLE IF NOT EXISTS insurance_policies (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    child_id BIGINT COMMENT '关联孩子ID',
+    policy_name VARCHAR(100) NOT NULL COMMENT '保单名称',
+    insurance_company VARCHAR(100) COMMENT '保险公司',
+    policy_type VARCHAR(50) COMMENT '保单类型: medical/life/accident/education/endowment',
+    insured_person VARCHAR(50) NOT NULL COMMENT '被保人姓名',
+    premium INT COMMENT '保费(分)',
+    sum_insured INT COMMENT '保额(分)',
+    start_date DATE COMMENT '生效日期',
+    end_date DATE COMMENT '到期日期',
+    renewal_type VARCHAR(20) DEFAULT 'annual' COMMENT '续费类型: annual/monthly/single',
+    status VARCHAR(20) DEFAULT 'active' COMMENT '状态: active/expired/cancelled',
+    policy_no VARCHAR(100) COMMENT '保单号',
+    remark TEXT COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_user (user_id),
+    INDEX idx_child (child_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='保单管理表';
+
+-- =============================================
+-- 健康检测报告模块表
+-- =============================================
+
+-- 健康检测报告表
+CREATE TABLE IF NOT EXISTS health_reports (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT NOT NULL COMMENT '上传者用户ID(关联users表)',
+    subject_id BIGINT COMMENT '报告主体用户ID(关联users表,为null表示未绑定)',
+    family_id BIGINT COMMENT '家庭ID',
+    report_type VARCHAR(32) NOT NULL COMMENT '报告类型: physical_exam(体检)/gut_flora(菌群检测)',
+    report_date DATE COMMENT '报告日期',
+    overall_score INT COMMENT '健康总分(0-100)',
+    gut_health_score INT COMMENT '菌群健康分',
+    chronic_disease_score INT COMMENT '慢病控制分',
+    nutrition_score INT COMMENT '营养均衡分',
+    gut_age VARCHAR(32) COMMENT '肠道预测年龄',
+    gut_type VARCHAR(50) COMMENT '肠型',
+    file_url VARCHAR(500) COMMENT '报告文件URL',
+    status VARCHAR(20) DEFAULT 'active' COMMENT '状态: active/archived',
+    remark TEXT COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_user_id (user_id),
+    INDEX idx_subject_id (subject_id),
+    INDEX idx_family_id (family_id),
+    INDEX idx_report_type (report_type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='健康检测报告表';
+
+-- 健康报告查看权限表
+CREATE TABLE IF NOT EXISTS health_report_permissions (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    report_id BIGINT NOT NULL COMMENT '报告ID',
+    user_id BIGINT NOT NULL COMMENT '有查看权限的用户ID',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    UNIQUE KEY uk_report_user (report_id, user_id),
+    INDEX idx_report_id (report_id),
+    INDEX idx_user_id (user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='健康报告查看权限表';
+
+-- 健康指标明细表
+CREATE TABLE IF NOT EXISTS health_indicators (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    report_id BIGINT NOT NULL COMMENT '关联报告ID',
+    category VARCHAR(50) COMMENT '指标分类: 营养状况/疾病风险/肠道屏障/神经递质/...',
+    indicator_name VARCHAR(100) NOT NULL COMMENT '指标名称',
+    indicator_value VARCHAR(100) COMMENT '检测值',
+    unit VARCHAR(50) COMMENT '单位',
+    ref_range VARCHAR(200) COMMENT '参考范围',
+    status VARCHAR(50) COMMENT '评估状态: 正常/偏低/偏高/过多/注意/低风险/未检出',
+    sort_order INT DEFAULT 0 COMMENT '显示排序',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_report_id (report_id),
+    INDEX idx_category (category)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='健康指标明细表';
+
+-- 健康报告上传草稿表(两阶段入库的中间态)
+CREATE TABLE IF NOT EXISTS health_report_drafts (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT NOT NULL COMMENT '上传人用户ID',
+    family_id BIGINT COMMENT '家庭ID',
+    report_type VARCHAR(32) NOT NULL COMMENT '报告类型: physical_exam/gut_flora',
+    file_url VARCHAR(500) COMMENT '上传的文件URL',
+    original_filename VARCHAR(255) COMMENT '原始文件名',
+    payload_json MEDIUMTEXT NOT NULL COMMENT '草稿载荷JSON(含解析/手动录入的所有指标)',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/confirmed/discarded',
+    expire_at DATETIME COMMENT '草稿过期时间',
+    confirmed_report_id BIGINT COMMENT 'confirm阶段入库后的健康报告ID',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_user_id (user_id),
+    INDEX idx_status_expire (status, expire_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='健康报告上传草稿表(两阶段入库中间态)';
+
+-- ===== v1.2 先天属性体系 =====
+
+-- 家庭成员先天属性表
+CREATE TABLE IF NOT EXISTS family_member_attributes (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id        BIGINT       NOT NULL COMMENT '家庭成员ID(children表或users表)',
+    member_type      VARCHAR(10)  NOT NULL COMMENT '成员类型: child/parent',
+    birth_datetime   DATETIME     COMMENT '出生日期(精确到分钟,用于八字排盘)',
+    eight_characters JSON         COMMENT '八字四柱JSON',
+    wuxing_elements  JSON         COMMENT '五行星盘元素JSON',
+    zodiac           VARCHAR(16)  COMMENT '生肖: rat/ox/tiger/rabbit/dragon/snake/horse/sheep/monkey/rooster/dog/pig',
+    blood_type       VARCHAR(5)   COMMENT '血型: A/B/AB/O',
+    mind_base_score  INT DEFAULT 0 COMMENT '心维度基础分(百分位)',
+    wisdom_base_score INT DEFAULT 0 COMMENT '智维度基础分(百分位)',
+    behavior_modifier JSON        COMMENT '行为修正因子JSON',
+    created_at       DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at       DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_member (member_id, member_type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭成员先天属性表';
+
+-- 星座配置表
+CREATE TABLE IF NOT EXISTS zodiac_config (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    zodiac_code      VARCHAR(20)  NOT NULL UNIQUE COMMENT '星座代码',
+    zodiac_name      VARCHAR(10)  NOT NULL COMMENT '星座名称',
+    element          VARCHAR(10)  NOT NULL COMMENT '五行: 金木水火土',
+    start_month      INT          NOT NULL COMMENT '起始月',
+    start_day        INT          NOT NULL COMMENT '起始日',
+    end_month        INT          NOT NULL COMMENT '结束月',
+    end_day          INT          NOT NULL COMMENT '结束日',
+    mind_base        INT DEFAULT 0 COMMENT '心先天基础分(百分位)',
+    wisdom_base      INT DEFAULT 0 COMMENT '智先天基础分(百分位)',
+    body_modifier    INT DEFAULT 0 COMMENT '身修正系数(千分比)',
+    action_modifier  INT DEFAULT 0 COMMENT '行修正系数(千分比)',
+    wealth_modifier  INT DEFAULT 0 COMMENT '富修正系数(千分比)',
+    created_at       DATETIME DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='星座配置表';
+
+-- 八字配置表
+CREATE TABLE IF NOT EXISTS bazi_config (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    stem_or_branch   VARCHAR(10)  NOT NULL COMMENT '天干或地支',
+    type             VARCHAR(10)  NOT NULL COMMENT '类型: stem/branch',
+    element          VARCHAR(10)  NOT NULL COMMENT '五行: 金木水火土',
+    yin_yang         VARCHAR(5)   COMMENT '阴阳: yin/yang',
+    mind_base        INT DEFAULT 0 COMMENT '心先天基础分(百分位)',
+    wisdom_base      INT DEFAULT 0 COMMENT '智先天基础分(百分位)',
+    body_modifier    INT DEFAULT 0 COMMENT '身修正系数(千分比)',
+    action_modifier  INT DEFAULT 0 COMMENT '行修正系数(千分比)',
+    wealth_modifier  INT DEFAULT 0 COMMENT '富修正系数(千分比)',
+    created_at       DATETIME DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='八字配置表(天干地支五行)';
+
+-- 血型配置表
+CREATE TABLE IF NOT EXISTS blood_type_config (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    blood_type       VARCHAR(5)   NOT NULL UNIQUE COMMENT '血型: A/B/AB/O',
+    description      TEXT COMMENT '性格描述',
+    mind_base        INT DEFAULT 0 COMMENT '心先天基础分(百分位)',
+    wisdom_base      INT DEFAULT 0 COMMENT '智先天基础分(百分位)',
+    body_modifier    INT DEFAULT 0 COMMENT '身修正系数(千分比)',
+    action_modifier  INT DEFAULT 0 COMMENT '行修正系数(千分比)',
+    wealth_modifier  INT DEFAULT 0 COMMENT '富修正系数(千分比)',
+    created_at       DATETIME DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='血型配置表';
+
+-- =============================================
+-- 活动报名 与 能量规则引擎表(v1.4)
+-- =============================================
+
+-- 活动报名表
+CREATE TABLE IF NOT EXISTS activity_registrations (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    activity_id BIGINT NOT NULL COMMENT '活动ID',
+    child_id BIGINT NOT NULL COMMENT '孩子ID',
+    user_id BIGINT NOT NULL COMMENT '报名人用户ID(家长)',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/approved/rejected/cancelled',
+    registered_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '报名时间',
+    approved_at DATETIME COMMENT '审核通过时间',
+    approved_by BIGINT COMMENT '审核人用户ID',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    UNIQUE KEY uk_activity_child (activity_id, child_id),
+    INDEX idx_activity_id (activity_id),
+    INDEX idx_child_id (child_id),
+    INDEX idx_user_id (user_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='活动报名表';
+
+-- 能量规则表(规则引擎)
+CREATE TABLE IF NOT EXISTS energy_rule (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    rule_code VARCHAR(64) NOT NULL UNIQUE COMMENT '规则编码(唯一)',
+    rule_name VARCHAR(200) NOT NULL COMMENT '规则名称',
+    event_type VARCHAR(32) NOT NULL COMMENT '事件类型: checkin/register/complete/cancel/overdue',
+    action VARCHAR(16) NOT NULL COMMENT '动作: increase/decrease',
+    dimension_code VARCHAR(20) COMMENT '维度代码: body/mind/wisdom/action/wealth(NULL=五维均衡)',
+    amount INT COMMENT '固定变动量(基点)',
+    amount_formula VARCHAR(255) COMMENT '动态公式(如: balance*0.1)',
+    priority INT DEFAULT 0 COMMENT '优先级(数字越大越优先匹配)',
+    conditions JSON COMMENT '触发条件(JSON表达式)',
+    status TINYINT DEFAULT 1 COMMENT '状态: 1=启用 0=禁用',
+    description TEXT COMMENT '规则描述',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_event_type (event_type),
+    INDEX idx_status (status),
+    INDEX idx_priority (priority)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='能量规则表(规则引擎)';
+
+CREATE TABLE IF NOT EXISTS activities (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    title            VARCHAR(100) NOT NULL COMMENT '活动标题',
+    description      TEXT COMMENT '活动描述',
+    cover_image      VARCHAR(500) COMMENT '封面图片URL',
+    dimension_code   VARCHAR(20) COMMENT '维度代码: body/mind/wisdom/action/wealth',
+    activity_type    VARCHAR(20) DEFAULT 'offline' COMMENT '活动类型: offline/online/campaign',
+    status           VARCHAR(20) DEFAULT 'draft' COMMENT '状态: draft/published/ended',
+    start_time       DATETIME COMMENT '开始时间',
+    end_time         DATETIME COMMENT '结束时间',
+    location         VARCHAR(200) COMMENT '活动地点',
+    max_participants INT DEFAULT 0 COMMENT '最大参与人数',
+    current_participants INT DEFAULT 0 COMMENT '当前参与人数',
+    price INT DEFAULT 0 COMMENT '活动价格(分)',
+    vendor_id        BIGINT COMMENT '服务商ID',
+    vendor_name      VARCHAR(100) COMMENT '服务商名称',
+    dimension_weights TEXT COMMENT '五维能量权重JSON',
+    created_at       DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at       DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_dimension (dimension_code),
+    INDEX idx_status (status),
+    INDEX idx_start_time (start_time)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='活动表';
+
+-- v1.x: 活动工作流状态扩展
+ALTER TABLE activities
+  MODIFY COLUMN status VARCHAR(20) DEFAULT 'draft'
+    COMMENT '状态:draft(草稿)/pending(待审核)/rejected(已驳回)/published(发布中)/withdrawn(已撤回)',
+  ADD COLUMN audit_status VARCHAR(20) DEFAULT NULL
+    COMMENT '审核状态:approved/pending/rejected',
+  ADD COLUMN audit_reason TEXT DEFAULT NULL
+    COMMENT '驳回原因',
+  ADD COLUMN auditor_id BIGINT DEFAULT NULL
+    COMMENT '审核人 ID',
+  ADD COLUMN audited_at DATETIME DEFAULT NULL
+    COMMENT '审核时间';
+
+-- ===== v1.3 家庭成员体系 =====
+
+-- 手动添加的家庭成员表(替代children表用于新成员)
+CREATE TABLE IF NOT EXISTS family_members (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id        BIGINT       NOT NULL COMMENT '所属家庭ID',
+    user_id          BIGINT       COMMENT '关联的用户ID(手机号匹配到已有用户时)',
+    nickname         VARCHAR(100) NOT NULL COMMENT '昵称',
+    phone            VARCHAR(20)  COMMENT '手机号',
+    avatar           VARCHAR(500) COMMENT '头像',
+    gender           VARCHAR(10)  COMMENT '性别: male/female',
+    birthday         DATE         COMMENT '出生日期',
+    birth_hour       VARCHAR(16)  COMMENT '出生时辰: 子丑寅卯辰巳午未申酉戌亥',
+    birth_weight     INT          COMMENT '出生体重(克)',
+    birth_place      VARCHAR(128) COMMENT '出生地',
+    is_cesarean      TINYINT      COMMENT '是否剖腹产: 0=顺产, 1=剖腹产',
+    generation       INT          COMMENT '辈分值(0=家庭创建者,+n=向上n代,-n=向下n代)',
+    is_spouse        TINYINT(1)   COMMENT '是否配偶(同辈中)',
+    relationship_type VARCHAR(50) NOT NULL COMMENT '关系类型key',
+    role_override VARCHAR(20) DEFAULT 'auto' COMMENT '角色覆盖: auto/parent/child/elderly,空=auto',
+    show_to_family INT DEFAULT 1 COMMENT '对家庭成员可见: 1=可见, 0=不可见',
+    total_points INT DEFAULT 0 COMMENT '总积分',
+    -- 孩子专属字段(原children表合并)
+    id_card VARCHAR(18) DEFAULT NULL COMMENT '身份证号(孩子)',
+    penalty_enabled TINYINT DEFAULT 1 COMMENT '是否扣减积分(0否1是)',
+    theme VARCHAR(32) DEFAULT 'default' COMMENT '主题',
+    system_points INT DEFAULT 0 COMMENT '系统积分(干预/平台奖励)',
+    streak_days INT DEFAULT 0 COMMENT '连续打卡天数',
+    last_task_date DATE COMMENT '上次任务日期',
+    focus_max_daily TINYINT DEFAULT 3 COMMENT '每日专注上限',
+    focus_remaining TINYINT DEFAULT 3 COMMENT '今日剩余专注次数',
+    focus_reset_date DATE COMMENT '专注次数重置日期',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_family_id (family_id),
+    INDEX idx_phone (phone)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭成员表(手动添加)';
+
+-- 家庭成员双向关系表(v2: 替代relationship_type/role_override)
+CREATE TABLE IF NOT EXISTS family_relationships (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id        BIGINT       NOT NULL COMMENT '所属家庭ID',
+    from_member_id   BIGINT       NOT NULL COMMENT '关系起点成员ID',
+    to_member_id     BIGINT       NOT NULL COMMENT '关系终点成员ID',
+    generation_value INT          NOT NULL COMMENT '辈分值: -1=子女, 0=同辈, 1=父母, 2=祖父母, 3=曾祖父母',
+    relationship_key VARCHAR(50)  COMMENT '关系标签key(冗余用于显示, 如father/mother/son/daughter/spouse/sibling)',
+    created_at       DATETIME     DEFAULT CURRENT_TIMESTAMP,
+    updated_at       DATETIME     DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_from_to (from_member_id, to_member_id),
+    INDEX idx_family_id (family_id),
+    INDEX idx_from (from_member_id),
+    INDEX idx_to (to_member_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭成员双向关系表';
+
+-- 关系类型配置表(管理端可配置)
+CREATE TABLE IF NOT EXISTS relationship_types (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    type_key         VARCHAR(50)  NOT NULL UNIQUE COMMENT '类型标识: spouse/parent/child/sibling',
+    type_name        VARCHAR(100) NOT NULL COMMENT '类型显示名: 配偶/父母/子女/兄弟姐妹',
+    capability_role  VARCHAR(20)  NOT NULL DEFAULT 'parent' COMMENT '能力角色: parent/child',
+    default_role     VARCHAR(20)  DEFAULT NULL COMMENT '默认角色模板: parent/child(已废弃, 兼容保留)',
+    sort_order       INT DEFAULT 0 COMMENT '排序序号',
+    enabled          INT DEFAULT 1 COMMENT '是否启用: 1=启用, 0=禁用',
+    category         VARCHAR(50)  DEFAULT 'social' COMMENT '关系分类: blood血亲/marriage姻亲/social社会关系',
+    is_blood_relation TINYINT     DEFAULT 0 COMMENT '是否血亲关系: 1是0否',
+    is_immediate_family TINYINT   DEFAULT 0 COMMENT '是否直系亲属: 1是0否',
+    created_at       DATETIME DEFAULT CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='关系类型配置表';
+
+-- 默认关系类型数据(default_role: parent/child 为该关系类型的默认角色模板)
+INSERT IGNORE INTO relationship_types (type_key, type_name, default_role, sort_order, enabled, category, is_blood_relation, is_immediate_family) VALUES
+('spouse', '配偶', 'parent', 1, 1, 'marriage', 0, 1),
+('parent', '父母', 'parent', 2, 1, 'blood', 1, 1),
+('child', '子女', 'child', 3, 1, 'blood', 1, 1),
+('sibling', '兄弟姐妹', 'child', 4, 1, 'blood', 1, 0);
+
+-- 用户收货地址表
+CREATE TABLE IF NOT EXISTS user_address (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    receiver_name VARCHAR(50) NOT NULL COMMENT '收货人姓名',
+    phone VARCHAR(20) NOT NULL COMMENT '收货人电话',
+    province VARCHAR(50) COMMENT '省',
+    city VARCHAR(50) COMMENT '市',
+    district VARCHAR(50) COMMENT '区',
+    street VARCHAR(200) COMMENT '详细地址',
+    is_default TINYINT DEFAULT 0 COMMENT '是否默认地址 1=是 0=否',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_user_id (user_id),
+    INDEX idx_is_default (is_default)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户收货地址表';
+
+-- =============================================
+-- 新手引导奖励表
+-- =============================================
+
+CREATE TABLE IF NOT EXISTS onboarding_task (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL,
+    task_type VARCHAR(32) NOT NULL,
+    reward_points INT DEFAULT 0,
+    reward_energy INT DEFAULT 0,
+    status VARCHAR(16) DEFAULT 'PENDING',
+    completed_at DATETIME,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_user_id (user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- =============================================
+-- 成长任务配置表
+-- =============================================
+
+CREATE TABLE IF NOT EXISTS growth_task (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    type VARCHAR(16) NOT NULL COMMENT 'DAILY/NEWBIE',
+    title VARCHAR(100) NOT NULL,
+    description TEXT,
+    reward_points INT DEFAULT 0,
+    reward_energy INT DEFAULT 0,
+    target_value INT DEFAULT 1,
+    task_key VARCHAR(32) UNIQUE NOT NULL,
+    enabled TINYINT DEFAULT 1,
+    sort_order INT DEFAULT 0,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_type (type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成长任务配置表';
+
+CREATE TABLE IF NOT EXISTS growth_task_log (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL,
+    task_id BIGINT NOT NULL,
+    progress INT DEFAULT 0,
+    completed TINYINT DEFAULT 0,
+    claimed TINYINT DEFAULT 0,
+    date VARCHAR(10) COMMENT 'YYYY-MM-DD for daily, empty for newbie',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_user_date (user_id, date),
+    INDEX idx_task_id (task_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成长任务用户进度表';
+
+-- =============================================
+-- 优惠券配置表
+-- =============================================
+
+CREATE TABLE IF NOT EXISTS coupon (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(64) NOT NULL,
+    type VARCHAR(16) DEFAULT 'FIXED',
+    value INT DEFAULT 0 COMMENT '金额 单位:分',
+    min_spend INT DEFAULT 0 COMMENT '最低消费 单位:分',
+    applicable_to VARCHAR(32) DEFAULT 'ALL',
+    valid_from DATETIME,
+    valid_until DATETIME,
+    total_count INT DEFAULT 0,
+    used_count INT DEFAULT 0,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_valid_period (valid_from, valid_until)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='优惠券配置表';
+
+CREATE TABLE IF NOT EXISTS user_coupon (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL,
+    coupon_id BIGINT NOT NULL,
+    status VARCHAR(16) DEFAULT 'AVAILABLE',
+    received_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    used_at DATETIME,
+    order_id BIGINT,
+    INDEX idx_user_coupon (user_id, coupon_id),
+    INDEX idx_status (status),
+    INDEX idx_order_id (order_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户优惠券表';
+
+-- =============================================
+-- 邀请里程碑表
+-- =============================================
+
+CREATE TABLE IF NOT EXISTS invite_milestone (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL,
+    milestone VARCHAR(32) NOT NULL,
+    reward_points INT DEFAULT 0,
+    reward_energy INT DEFAULT 0,
+    status VARCHAR(16) DEFAULT 'PENDING',
+    achieved_at DATETIME,
+    claimed_at DATETIME,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_user_milestone (user_id, milestone)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='邀请里程碑表';
+
+-- =============================================
+-- 推广排行榜周记录表
+-- =============================================
+
+CREATE TABLE IF NOT EXISTS referral_leaderboard (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL,
+    week_start VARCHAR(10) NOT NULL COMMENT '周一日期 YYYY-MM-DD',
+    referral_count INT DEFAULT 0,
+    `rank` INT,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE INDEX idx_user_week (user_id, week_start),
+    INDEX idx_week_rank (week_start, referral_count DESC)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='推广排行榜周记录';
+
+-- =============================================
+-- 虚拟服务商团队(销售体系)
+-- =============================================
+
+CREATE TABLE IF NOT EXISTS `distribution_systems` (
+    `id` BIGINT AUTO_INCREMENT PRIMARY KEY,
+    `name` VARCHAR(100) NOT NULL COMMENT '团队名称',
+    `description` TEXT COMMENT '团队描述',
+    `owner_id` BIGINT COMMENT '创建人(服务商用户ID)',
+    `profit_rate` INT DEFAULT 0 COMMENT '利润分成比例(bps, 如2000=20%)',
+    `enabled` TINYINT(1) DEFAULT 1 COMMENT '是否启用',
+    `created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+    `updated_at` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='虚拟服务商团队(销售体系)';
+
+CREATE TABLE IF NOT EXISTS `distribution_relations` (
+    `id` BIGINT AUTO_INCREMENT PRIMARY KEY,
+    `system_id` BIGINT NOT NULL COMMENT '所属团队ID',
+    `user_id` BIGINT NOT NULL COMMENT '服务商用户ID',
+    `parent_id` BIGINT COMMENT '上级服务商用户ID',
+    `depth` INT DEFAULT 0 COMMENT '层级深度(0=root)',
+    `created_at` DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_system (system_id),
+    INDEX idx_user (user_id),
+    INDEX idx_parent (parent_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='团队-服务商关系(同一人在不同团队可处于不同位置)';
+
+-- =============================================
+-- 成长任务种子数据
+-- =============================================
+
+INSERT IGNORE INTO growth_task (type, title, description, reward_points, reward_energy, target_value, task_key, sort_order) VALUES
+('DAILY', '每日签到', '完成每日签到', 20, 3, 1, 'DAILY_CHECKIN', 1),
+('DAILY', '完成任务', '完成一个任务', 30, 5, 1, 'DAILY_TASK', 2),
+('DAILY', '分享文章', '分享一篇好文给好友', 10, 2, 1, 'DAILY_SHARE', 3),
+('DAILY', 'AI对话', '与AI助手进行一次对话', 15, 3, 1, 'DAILY_AI', 4);
+
+-- ========== 全域指标定义表 ==========
+-- ===== v1.5 家庭文化镜:关系兼容性配置 =====
+
+-- 生肖配对规则表
+CREATE TABLE IF NOT EXISTS zodiac_pairing (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    zodiac_code_1    VARCHAR(20) NOT NULL COMMENT '生肖代码1',
+    zodiac_code_2    VARCHAR(20) NOT NULL COMMENT '生肖代码2',
+    pairing_type     VARCHAR(20) NOT NULL COMMENT '配对类型: liuhe/sanhe/banhe/liuchong/xianghai/xiangxing/ping',
+    compatibility_score INT DEFAULT 50 COMMENT '兼容分 0-100',
+    description      TEXT COMMENT '配对解读',
+    advice           TEXT COMMENT '相处建议',
+    created_at       DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_zodiac_pair (zodiac_code_1, zodiac_code_2)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生肖配对规则表';
+
+-- 十二生肖六合/三合/六冲种子数据
+INSERT IGNORE INTO zodiac_pairing (zodiac_code_1, zodiac_code_2, pairing_type, compatibility_score, description, advice) VALUES
+('rat', 'ox', 'liuhe', 100, '子丑六合,天生一对', '你们是最佳拍档,互相补充,默契十足'),
+('rat', 'monkey', 'sanhe', 85, '申子半合水局,默契度高', '智慧结合,创意无限,适合一起做规划'),
+('rat', 'dragon', 'sanhe', 85, '子辰半合水局,相辅相成', '一个机灵一个大气,共同成就大事'),
+('rat', 'horse', 'liuchong', 20, '子午相冲,水火不容', '价值观差异大,需要多包容理解'),
+('rat', 'tiger', 'xiangxing', 30, '寅子相刑,容易误会', '沟通方式不同,建议用行动代替言语'),
+('rat', 'rabbit', 'xiangxing', 30, '卯子相刑,互不相让', '各执己见时先冷静再沟通'),
+('rat', 'sheep', 'xianghai', 35, '子未相害,暗中较劲', '表面和谐但内心可能有竞争意识'),
+('ox', 'tiger', 'ping', 55, '牛虎平平,互敬互重', '踏实遇上冒险,可以互相学习'),
+('ox', 'rabbit', 'xianghai', 35, '丑卯相害,各怀心思', '建议开诚布公,减少猜测'),
+('ox', 'dragon', 'ping', 55, '牛龙平平,求同存异', '务实和理想主义的碰撞'),
+('ox', 'snake', 'sanhe', 85, '巳酉丑三合金局,配合默契', '务实加智慧,黄金搭档'),
+('ox', 'horse', 'xianghai', 35, '丑午相害,相处需技巧', '步调不同,需要彼此迁就'),
+('ox', 'sheep', 'liuchong', 20, '丑未相冲,针锋相对', '一个固执一个犟,需要第三方调和'),
+('tiger', 'rabbit', 'ping', 55, '虎兔平平,各有所长', '虎的魄力配兔的细腻,互补型'),
+('tiger', 'dragon', 'ping', 55, '虎龙平平,互相欣赏', '都有王者风范,但要注意谁说了算'),
+('tiger', 'snake', 'xianghai', 35, '寅巳相害,互相防备', '一个直率一个深沉,需要更多信任'),
+('tiger', 'horse', 'sanhe', 85, '寅午半合火局,一拍即合', '热情似火,志同道合的行动派'),
+('tiger', 'sheep', 'ping', 55, '虎羊平平,温柔与力量', '虎保护羊,羊温暖虎'),
+('tiger', 'monkey', 'liuchong', 20, '寅申相冲,竞争关系', '针尖对麦芒,需要在竞争中找合作'),
+('tiger', 'pig', 'liuhe', 100, '寅亥六合,情投意合', '虎猪相合,真诚相待的最佳组合'),
+('rabbit', 'dragon', 'xianghai', 35, '卯辰相害,表面和谐', '温和遇到强势,需要找到平衡'),
+('rabbit', 'snake', 'ping', 55, '兔蛇平平,温和相处', '都是内敛型,适合安静的陪伴'),
+('rabbit', 'horse', 'ping', 55, '兔马平平,一动一静', '一个爱静一个爱动,互相调剂'),
+('rabbit', 'sheep', 'sanhe', 85, '卯未半合木局,志趣相投', '文艺组合,品味相投'),
+('rabbit', 'monkey', 'xiangxing', 30, '卯申相刑,互不买账', '思维方式差异大,需要耐心'),
+('rabbit', 'rooster', 'liuchong', 20, '卯酉相冲,水火难容', '生活节奏完全不同,需要大包容'),
+('rabbit', 'dog', 'liuhe', 100, '卯戌六合,忠诚相伴', '兔狗相合,彼此忠诚的最佳关系'),
+('dragon', 'snake', 'ping', 55, '龙蛇平平,同源相惜', '都有神秘气质,惺惺相惜'),
+('dragon', 'horse', 'ping', 55, '龙马平平,各有天地', '一个在天一个在地,互不干涉'),
+('dragon', 'sheep', 'xiangxing', 30, '辰未相刑,暗中别扭', '看似无事却有暗流,多交流可化解'),
+('dragon', 'monkey', 'sanhe', 85, '申子辰三合水局,天生队友', '最佳事业组合,互相成就'),
+('dragon', 'rooster', 'liuhe', 100, '辰酉六合,珠联璧合', '龙凤配,传统的最佳搭档'),
+('dragon', 'dog', 'liuchong', 20, '辰戌相冲,正面冲突', '硬碰硬的关系,需要智慧化解'),
+('snake', 'horse', 'xiangxing', 30, '巳午相刑,热度不同', '蛇冷静马热情,温度要调和'),
+('snake', 'sheep', 'sanhe', 85, '巳酉丑三合金局,智慧搭档', '沉稳加温柔,互相信任的深层关系'),
+('snake', 'monkey', 'liuhe', 100, '巳申六合,智谋相投', '聪明人之间的默契'),
+('snake', 'rooster', 'sanhe', 85, '巳酉丑三合金局,配合无间', '细节控和完美主义者的理想组合'),
+('snake', 'pig', 'liuchong', 20, '巳亥相冲,南辕北辙', '一个深沉一个随性,需要大幅磨合'),
+('horse', 'sheep', 'liuhe', 100, '午未六合,温情相依', '马羊相合,温暖体贴的最佳关系'),
+('horse', 'monkey', 'xiangxing', 30, '午申相刑,互不理解', '行动派和思考派的碰撞'),
+('horse', 'rooster', 'xiangxing', 30, '午酉相刑,意气用事', '都容易冲动,需要一个冷静者调和'),
+('horse', 'dog', 'sanhe', 85, '寅午戌三合火局,行动搭档', '热情忠诚组合,一起行动效率高'),
+('horse', 'pig', 'liuhe', 100, '亥午暗合,心有灵犀', '一静一动却暗合,出人意料的默契'),
+('sheep', 'monkey', 'xiangxing', 30, '未申相刑,互挑毛病', '容易在小事上相互挑剔'),
+('sheep', 'rooster', 'ping', 55, '羊鸡平平,互相欣赏', '羊的细腻欣赏鸡的精致'),
+('sheep', 'dog', 'xiangxing', 30, '未戌相刑,各怀心事', '需要建立更深层的信任'),
+('sheep', 'pig', 'sanhe', 85, '亥卯未三合木局,温柔组合', '温和的三合组,舒适无压力的关系'),
+('monkey', 'rooster', 'ping', 55, '猴鸡平平,互相启发', '聪明人的相遇,火花四射'),
+('monkey', 'dog', 'xiangxing', 30, '申戌相刑,互不信任', '需要时间证明真心'),
+('monkey', 'pig', 'liuhe', 100, '申亥六合,智勇双全', '猴子机智猪包容,最佳朋友组合'),
+('rooster', 'dog', 'xiangxing', 30, '酉戌相刑,互相挑剔', '完美主义遇见忠诚卫士,互相看不惯'),
+('rooster', 'pig', 'ping', 55, '鸡猪平平,各取所需', '鸡的精明和猪的豁达互相补充'),
+('dog', 'pig', 'sanhe', 85, '寅午戌三合火局,忠诚相伴', '忠诚的守护组合,互相支持');
+
+-- 血型配对表
+CREATE TABLE IF NOT EXISTS blood_type_pairing (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    blood_type_1     VARCHAR(5) NOT NULL COMMENT '血型1',
+    blood_type_2     VARCHAR(5) NOT NULL COMMENT '血型2',
+    compatibility_score INT DEFAULT 50 COMMENT '兼容分 0-100',
+    description      TEXT COMMENT '配对描述',
+    advice           TEXT COMMENT '相处建议',
+    created_at       DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_blood_pair (blood_type_1, blood_type_2)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='血型配对表';
+
+INSERT IGNORE INTO blood_type_pairing (blood_type_1, blood_type_2, compatibility_score, description, advice) VALUES
+('A', 'A', 80, '同型相吸,稳重默契', '都能理解对方的细腻敏感,但注意不要一起钻牛角尖'),
+('A', 'B', 50, '互补型,有吸引力也有摩擦', 'B型的自由奔放吸引A型,但A型的严谨可能让B型感到压力'),
+('A', 'O', 75, 'A主内O主外,搭配和谐', 'O型的大气包容A型的细致,是最常见的和谐组合'),
+('A', 'AB', 70, 'AB型善解人意,A型感到被理解', 'AB型的理性刚好平衡A型的感性'),
+('B', 'B', 75, '同型相投,自由自在', '都给彼此空间,但可能缺乏规划'),
+('B', 'O', 70, 'O型包容B型,相处轻松', 'O型的稳定给了B型安全感'),
+('B', 'AB', 65, '互相欣赏,各有天地', 'B型的创意和AB型的分析能力互补'),
+('O', 'O', 85, '强强联合,行动力爆棚', '都是行动派,但要注意不要都太强势'),
+('O', 'AB', 75, 'O型领导,AB型军师', 'O型的大方向加AB型的精细思维,无敌组合'),
+('AB', 'AB', 60, '互相理解但可能过度理性', '两个理性派,别忘了情感交流');
+
+-- 生命灵数关系解读表
+CREATE TABLE IF NOT EXISTS life_number_relationship (
+    id               BIGINT AUTO_INCREMENT PRIMARY KEY,
+    relationship_number INT NOT NULL COMMENT '关系数字 1-9',
+    title            VARCHAR(100) COMMENT '关系主题',
+    description      TEXT COMMENT '关系解读',
+    advice           TEXT COMMENT '相处建议',
+    color_hex        VARCHAR(10) COMMENT '代表色',
+    created_at       DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_relationship_num (relationship_number)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生命灵数关系解读表';
+
+INSERT IGNORE INTO life_number_relationship (relationship_number, title, description, advice, color_hex) VALUES
+(1, '开创者关系', '你们在一起充满创造力和领导力,彼此激励去实现目标', '注意不要互相竞争谁说了算,明确分工才能发挥最大能量', '#FF4444'),
+(2, '合作伙伴关系', '你们是天生的搭档,善于倾听和配合,营造和谐氛围', '过于迁就对方可能会失去自我,保持适度独立才能长久', '#FF8C42'),
+(3, '创意火花关系', '在一起充满欢乐和创造力,社交圈会因为你们而扩大', '注意不要太表面化,偶尔需要深度的对话来维系情感', '#FFD700'),
+(4, '建设者关系', '你们是务实稳健的组合,能一起把想法变成现实', '生活不能只有工作和责任,记得给彼此创造惊喜和浪漫', '#10B981'),
+(5, '探险者关系', '在一起充满变化和新鲜感,喜欢一起探索未知', '变化太多可能会让关系缺乏安全感,寻找一些共同的固定仪式', '#3B82F6'),
+(6, '守护者关系', '你们的关系以关爱和责任为基础,彼此是最坚实的后盾', '付出太多可能会感到疲惫,学会接受对方的爱和照顾', '#6366F1'),
+(7, '智者关系', '在一起有深度的精神交流和思想碰撞,追求真理', '不要沉浸在各自的世界里,记得用简单的方式表达爱', '#8B5CF6'),
+(8, '成就者关系', '你们是强强联合,追求物质和事业上的共同成就', '在追求成功的同时不要忽视感情的温度,平衡事业和生活', '#F59E0B'),
+(9, '圆满者关系', '在一起有强烈的宿命感,彼此理解和支持,是灵魂伴侣', '太理想化可能会失望,接受对方的不完美才能走得更远', '#FF6B9D');
+
+CREATE TABLE IF NOT EXISTS indicator_definitions (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    domain VARCHAR(50) NOT NULL COMMENT '领域: physical/mental/nutrition/behavior/social',
+    category VARCHAR(50) NOT NULL COMMENT '分类: 舌色/苔色/情绪/...',
+    code VARCHAR(50) NOT NULL UNIQUE COMMENT '编码: tongue_color/coating_color/...',
+    name VARCHAR(100) NOT NULL COMMENT '显示名: 舌体颜色/苔色/...',
+    data_type VARCHAR(20) NOT NULL DEFAULT 'enum' COMMENT '数据类型: enum/number/string',
+    options JSON COMMENT '枚举值列表: ["淡红","红","绛","青紫"] 或 null',
+    unit VARCHAR(50) COMMENT '单位',
+    ref_range VARCHAR(200) COMMENT '参考范围',
+    sort_order INT DEFAULT 0 COMMENT '排序',
+    status TINYINT DEFAULT 1 COMMENT '0=禁用 1=启用',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='全域指标定义';
+
+-- ========== 全域指标值表 ==========
+CREATE TABLE IF NOT EXISTS indicator_values (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    source_type VARCHAR(50) NOT NULL COMMENT '来源: tongue_record/health_report/assessment',
+    source_id BIGINT NOT NULL COMMENT '来源记录ID',
+    definition_id BIGINT NOT NULL COMMENT 'FK→indicator_definitions.id',
+    value VARCHAR(200) COMMENT '值',
+    numeric_value DECIMAL(10,2) COMMENT '数值(number类型时用)',
+    remark TEXT COMMENT '备注',
+    recorded_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_source (source_type, source_id),
+    INDEX idx_definition (definition_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='全域指标值';
+
+-- ========== 舌诊主记录表 ==========
+CREATE TABLE IF NOT EXISTS tongue_records (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT NOT NULL COMMENT '家庭成员ID',
+    child_id BIGINT COMMENT '孩子ID',
+    image_url VARCHAR(500) COMMENT '舌象图片URL',
+    overall_assessment TEXT COMMENT '总体评估',
+    status VARCHAR(20) DEFAULT 'draft' COMMENT 'draft/confirmed',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_member (member_id, child_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='舌诊主记录';
+
+-- ========== 种子数据:舌诊7项指标定义 ==========
+INSERT IGNORE INTO indicator_definitions (domain, category, code, name, data_type, options, sort_order, status) VALUES
+('physical', '舌色', 'tongue_color', '舌体颜色', 'enum', '["淡红","红","绛","青紫"]', 1, 1),
+('physical', '苔色', 'coating_color', '苔色', 'enum', '["薄白","白","黄","灰黑"]', 2, 1),
+('physical', '苔质', 'coating_texture', '苔质', 'enum', '["润","燥","滑","涩","腻"]', 3, 1),
+('physical', '裂纹', 'fissure', '裂纹程度', 'enum', '["无","轻","中","重"]', 4, 1),
+('physical', '齿痕', 'teeth_mark', '齿痕程度', 'enum', '["无","轻","中","重"]', 5, 1),
+('physical', '舌下络脉', 'sublingual_vein', '舌下络脉', 'enum', '["正常","轻","中","重"]', 6, 1),
+('physical', '体质', 'constitution', '体质辨识', 'enum', '["平和质","气虚质","阳虚质","阴虚质","湿热质","痰湿质","血瘀质","气郁质","特禀质"]', 7, 1);
+
+-- =============================================
+-- 活动报名 & 能量规则引擎 v1.4 - 字段扩展
+-- 通过 DatabaseInitializer.java 在 ALTER 阶段执行
+-- =============================================
+
+-- 活动表扩展字段
+ALTER TABLE activities ADD COLUMN require_registration TINYINT DEFAULT 1 COMMENT '是否需要报名: 1=需要, 0=直接参与';
+ALTER TABLE activities ADD COLUMN require_checkin_review TINYINT DEFAULT 1 COMMENT '打卡是否需要审核: 1=需要, 0=直接通过';
+ALTER TABLE activities ADD COLUMN energy_penalty_unregistered INT DEFAULT 5 COMMENT '未报名打卡的行能量扣减值';
+
+-- ============================================================
+-- 新增:系统配置表(角色年龄阈值等)
+-- ============================================================
+CREATE TABLE IF NOT EXISTS system_config (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    config_key VARCHAR(100) NOT NULL UNIQUE COMMENT '配置键',
+    config_value TEXT COMMENT '配置值',
+    description TEXT COMMENT '说明',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统配置表';
+
+-- ============================================================
+-- 数据迁移: children → family_members + roleOverride 变更
+-- 执行时机: Phase 9(所有代码变更完成后、上线前)
+-- ============================================================
+
+-- 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
+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';
+
+-- 3. 迁移 children 数据到 family_members(不匹配则插入新记录)
+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
+);
+
+-- 4. 插入 system_config 初始数据
+INSERT INTO system_config (config_key, config_value, description) VALUES
+  ('child_age_threshold', '18', '未成年年龄分界线(岁)'),
+  ('elderly_age_threshold', '65', '老年年龄分界线(岁)')
+ON DUPLICATE KEY UPDATE config_value = VALUES(config_value);
+
+-- 5. 删除 children 表(最后执行,确认迁移完成后再执行此步)
+-- DROP TABLE IF EXISTS children;
+
+-- ============================================================
+-- 购物车表
+-- ============================================================
+CREATE TABLE IF NOT EXISTS cart (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    product_id BIGINT NOT NULL COMMENT '商品ID',
+    quantity INT NOT NULL DEFAULT 1 COMMENT '数量',
+    sku_id BIGINT DEFAULT NULL COMMENT 'SKU ID',
+    spec_option_ids VARCHAR(500) DEFAULT NULL COMMENT '规格选项ID列表JSON',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_user_product (user_id, product_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='购物车';
+
+-- ============================================================
+-- 供应商销售体系
+-- ============================================================
+
+CREATE TABLE IF NOT EXISTS supply_system (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(100) NOT NULL COMMENT '体系名称',
+    admin_id BIGINT NOT NULL COMMENT '管理员用户ID',
+    settlement_period_days INT NOT NULL DEFAULT 30 COMMENT '账期(天)',
+    platform_profit_rate DECIMAL(5,2) NOT NULL DEFAULT 0 COMMENT '平台留利比例(%)',
+    description TEXT COMMENT '描述',
+    models TEXT COMMENT 'AI模型列表JSON,如["agnes-image-2.0-flash","agnes-2.5-flash"]',
+    api_endpoint VARCHAR(512) COMMENT 'API端点',
+    api_key VARCHAR(256) COMMENT 'API密钥',
+    status VARCHAR(20) NOT NULL DEFAULT 'active' COMMENT '状态: active/disabled',
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    KEY idx_admin_id (admin_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='供应商体系';
+
+CREATE TABLE IF NOT EXISTS supply_system_member (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    system_id BIGINT NOT NULL COMMENT '体系ID',
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    role VARCHAR(20) NOT NULL DEFAULT 'member' COMMENT '角色: admin/member',
+    status VARCHAR(20) NOT NULL DEFAULT 'active' COMMENT '状态: active/inactive',
+    joined_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_system_user (system_id, user_id),
+    KEY idx_user_id (user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='体系成员';
+
+CREATE TABLE IF NOT EXISTS supply_settlement (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    system_id BIGINT NOT NULL COMMENT '体系ID',
+    period_start DATE NOT NULL COMMENT '结算周期开始',
+    period_end DATE NOT NULL COMMENT '结算周期结束',
+    total_sales INT NOT NULL DEFAULT 0 COMMENT '销售总额(分)',
+    platform_profit INT NOT NULL DEFAULT 0 COMMENT '平台留利金额(分)',
+    supplier_payout INT NOT NULL DEFAULT 0 COMMENT '供应商实付(分)',
+    status VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT '状态: pending/settled',
+    settled_at DATETIME COMMENT '结算时间',
+    remark TEXT COMMENT '备注',
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    KEY idx_system_id (system_id),
+    KEY idx_period (period_start, period_end)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='结算记录';
+
+CREATE TABLE IF NOT EXISTS supply_settlement_detail (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    settlement_id BIGINT NOT NULL COMMENT '结算ID',
+    order_id BIGINT NOT NULL COMMENT '订单ID',
+    order_no VARCHAR(64) NOT NULL COMMENT '订单号',
+    product_name VARCHAR(200) NOT NULL COMMENT '商品名称',
+    amount INT NOT NULL COMMENT '订单金额(分)',
+    platform_fee INT NOT NULL COMMENT '平台留利(分)',
+    supplier_id BIGINT COMMENT '收款供应商用户ID',
+    supplier_name VARCHAR(100) COMMENT '收款供应商名称',
+    payout INT NOT NULL COMMENT '供应商实付(分)',
+    created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    KEY idx_settlement_id (settlement_id),
+    KEY idx_order_id (order_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='结算明细';
+
+-- =============================================
+-- 收货人与购买信息采集
+-- =============================================
+
+CREATE TABLE IF NOT EXISTS consignees (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    user_id BIGINT NOT NULL COMMENT '所属用户ID',
+    name VARCHAR(100) NOT NULL COMMENT '收货人姓名',
+    phone VARCHAR(20) COMMENT '手机号',
+    id_card VARCHAR(20) COMMENT '身份证号',
+    hand_signature TEXT COMMENT '手签名(base64图片或URL)',
+    ethnicity VARCHAR(20) COMMENT '民族',
+    blood_type VARCHAR(20) COMMENT '血型',
+    address VARCHAR(500) COMMENT '收货地址',
+    is_default TINYINT(1) DEFAULT 0 COMMENT '是否默认收货人',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    INDEX idx_user_id (user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='收货人信息(含购买所需特殊信息)';
+
+CREATE TABLE IF NOT EXISTS product_purchase_fields (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
+    product_id BIGINT NOT NULL COMMENT '商品ID',
+    field_key VARCHAR(50) NOT NULL COMMENT '字段标识: name/phone/id_card/hand_signature/ethnicity/blood_type',
+    field_name VARCHAR(100) NOT NULL COMMENT '显示名: 收货人姓名/手机号/身份证号/手签名/民族/血型',
+    is_required TINYINT(1) DEFAULT 1 COMMENT '是否必填 1=是 0=否',
+    sort_order INT DEFAULT 0 COMMENT '排序',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_product_id (product_id),
+    UNIQUE KEY uk_product_field (product_id, field_key)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品购买信息字段配置';
+
+-- AI管家会话表
+CREATE TABLE IF NOT EXISTS butler_sessions (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    title VARCHAR(200) DEFAULT '新会话' COMMENT '会话标题',
+    conversation_id VARCHAR(100) COMMENT 'Dify对话ID',
+    context TEXT COMMENT '上下文信息(JSON)',
+    status VARCHAR(20) DEFAULT 'active' COMMENT '状态: active(进行中)/archived(已归档)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_user_id (user_id),
+    INDEX idx_status (status),
+    INDEX idx_user_status (user_id, status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI管家会话表';
+
+-- 家庭订阅记录
+CREATE TABLE IF NOT EXISTS member_subscription (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    `level` VARCHAR(10) NOT NULL DEFAULT 'L1' COMMENT 'L1=一生一世, L2=久久一生',
+    status VARCHAR(20) NOT NULL DEFAULT 'active' COMMENT 'active/expired/cancelled',
+    start_time DATETIME DEFAULT NULL COMMENT '开始时间',
+    expire_time DATETIME DEFAULT NULL COMMENT '到期时间',
+    payment_id BIGINT DEFAULT NULL COMMENT '关联订单ID',
+    auto_renew TINYINT(1) DEFAULT 0 COMMENT '自动续费(L2)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_family_id (family_id),
+    INDEX idx_status (status),
+    INDEX idx_expire_time (expire_time)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭订阅记录';
+
+-- 订阅订单
+CREATE TABLE IF NOT EXISTS member_subscription_order (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    `level` VARCHAR(10) NOT NULL COMMENT 'L1/L2',
+    amount INT NOT NULL COMMENT '金额(分)',
+    status VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending/paid/cancelled/refunded',
+    payment_type VARCHAR(20) DEFAULT NULL COMMENT '支付方式 wechat/alipay',
+    transaction_id VARCHAR(64) DEFAULT NULL COMMENT '微信支付订单号',
+    order_no VARCHAR(64) NOT NULL COMMENT '订单号',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    paid_at DATETIME DEFAULT NULL,
+    UNIQUE KEY uk_order_no (order_no),
+    INDEX idx_family_id (family_id),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='订阅订单';
+
+-- 权益使用日志
+CREATE TABLE IF NOT EXISTS subscription_benefit_log (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    subscription_id BIGINT NOT NULL COMMENT '订阅ID',
+    benefit_code VARCHAR(50) NOT NULL COMMENT '权益代码',
+    used_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    detail TEXT COMMENT '使用详情(JSON)',
+    INDEX idx_subscription_id (subscription_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权益使用日志';
+
+-- 推广等级 R0-R4
+CREATE TABLE IF NOT EXISTS promotion_tier (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    tier VARCHAR(20) NOT NULL DEFAULT 'R0' COMMENT 'R0利他者/R1传福人/R2聚能师/R3启慧者/R4传承者',
+    team_size_1st INT DEFAULT 0 COMMENT '一层团队人数',
+    team_size_2nd INT DEFAULT 0 COMMENT '二层团队人数',
+    team_size_3rd INT DEFAULT 0 COMMENT '三层团队人数',
+    total_team_size INT DEFAULT 0 COMMENT '三层累计总人数',
+    total_referral_earnings INT DEFAULT 0 COMMENT '累计推荐佣金(分)',
+    total_share_earnings INT DEFAULT 0 COMMENT '累计消费返利(分)',
+    promoted_at DATETIME DEFAULT NULL COMMENT '最近晋级时间',
+    last_change_at DATETIME DEFAULT NULL COMMENT '最后变更时间',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_user_id (user_id),
+    INDEX idx_tier (tier)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='推广等级';
+
+-- 推广等级变更记录
+CREATE TABLE IF NOT EXISTS promotion_tier_change_log (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    old_tier VARCHAR(20) DEFAULT NULL COMMENT '变更前等级',
+    new_tier VARCHAR(20) NOT NULL COMMENT '变更后等级',
+    reason VARCHAR(50) DEFAULT NULL COMMENT 'qualify升级/demote降级/admin管理员调整',
+    changed_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_user_id (user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='推广等级变更记录';
+
+-- 推荐关系树(三层)
+CREATE TABLE IF NOT EXISTS referral_tree (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    parent_id BIGINT NOT NULL COMMENT '推荐人ID',
+    child_id BIGINT NOT NULL COMMENT '被推荐人ID',
+    level INT NOT NULL COMMENT '层级深度(1/2/3)',
+    path VARCHAR(255) DEFAULT NULL COMMENT 'materialized path如/1/2/3/',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_child_id (child_id),
+    INDEX idx_parent_id (parent_id),
+    INDEX idx_level (level)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='推荐关系树';
+
+-- 产品P点配置
+CREATE TABLE IF NOT EXISTS product_ppoint (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    product_id BIGINT NOT NULL COMMENT '产品ID',
+    ppoint INT NOT NULL DEFAULT 0 COMMENT 'P点值(平台利润分)',
+    start_date DATE DEFAULT NULL COMMENT '生效日期',
+    end_date DATE DEFAULT NULL COMMENT '失效日期',
+    created_by BIGINT DEFAULT NULL COMMENT '创建人',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_product_id (product_id),
+    INDEX idx_dates (start_date, end_date)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='产品P点配置';
+
+-- 测评商品扩展信息
+CREATE TABLE IF NOT EXISTS assessment_products (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    product_id BIGINT NOT NULL COMMENT '关联products表',
+    assessment_type VARCHAR(20) NOT NULL COMMENT 'single=单包, bundle=套餐',
+    total_sessions INT NOT NULL DEFAULT 1 COMMENT '包含测评次数',
+    validity_days INT NOT NULL DEFAULT 365 COMMENT '有效期(天)',
+    guide_scope VARCHAR(50) DEFAULT 'all' COMMENT '规划师范围: all/assigned/auto',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_product_id (product_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='测评商品扩展信息';
+
+-- 测评额度表
+CREATE TABLE IF NOT EXISTS assessment_quotas (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    quota_no VARCHAR(32) NOT NULL COMMENT '额度编号',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    child_id BIGINT COMMENT '指定孩子ID(NULL=不限)',
+    product_order_id BIGINT NOT NULL COMMENT '来源订单ID',
+    product_id BIGINT NOT NULL COMMENT '商品ID',
+    product_name VARCHAR(100) NOT NULL COMMENT '商品名快照',
+    total_sessions INT NOT NULL DEFAULT 1 COMMENT '总次数',
+    remaining_sessions INT NOT NULL DEFAULT 1 COMMENT '剩余次数',
+    validity_start DATETIME NOT NULL COMMENT '有效期开始',
+    validity_end DATETIME NOT NULL COMMENT '有效期截止',
+    status VARCHAR(20) NOT NULL DEFAULT 'active' COMMENT 'active/expired/used_all/cancelled',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_family (family_id),
+    INDEX idx_order (product_order_id),
+    UNIQUE KEY uk_quota_no (quota_no)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='测评额度表';
+
+-- 测评执行记录表
+CREATE TABLE IF NOT EXISTS assessment_executions (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    quota_id BIGINT NOT NULL COMMENT '关联额度ID',
+    child_id BIGINT NOT NULL COMMENT '被测评孩子',
+    guide_id BIGINT COMMENT '执行规划师ID',
+    assessment_type VARCHAR(30) COMMENT '本次具体测评类型',
+    appointment_id BIGINT COMMENT '关联预约ID',
+    result_id BIGINT COMMENT '关联测评结果ID',
+    status VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending/in_progress/completed/cancelled',
+    scheduled_date DATETIME COMMENT '预约执行时间',
+    completed_at DATETIME COMMENT '实际完成时间',
+    notes VARCHAR(500) COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_quota (quota_id),
+    INDEX idx_child (child_id),
+    INDEX idx_appointment (appointment_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='测评执行记录表';
+
+-- 测评指导意见表(结构化存储)
+CREATE TABLE IF NOT EXISTS growth_guidances (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    result_id BIGINT NOT NULL COMMENT '关联测评结果ID',
+    dimension VARCHAR(30) NOT NULL COMMENT '维度: attention/focus/memory/logic/emotion/general',
+    score INT COMMENT '该维度得分(0-100)',
+    suggestion TEXT NOT NULL COMMENT '建议内容',
+    priority INT DEFAULT 0 COMMENT '优先级(0=普通, 1=重要, 2=紧急)',
+    sort_order INT DEFAULT 0 COMMENT '排序',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_result (result_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='测评指导意见(结构化)';
+
+-- 方案生成规则表
+CREATE TABLE IF NOT EXISTS assessment_plan_rules (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    dimension VARCHAR(30) NOT NULL COMMENT '测评维度: attention/focus/memory/logic/emotion',
+    score_min INT NOT NULL COMMENT '分数下限(含)',
+    score_max INT NOT NULL COMMENT '分数上限(含)',
+    template_id BIGINT NOT NULL COMMENT '关联TaskTemplatePackage ID',
+    priority INT DEFAULT 0 COMMENT '优先级',
+    is_active TINYINT(1) DEFAULT 1 COMMENT '是否启用',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_dimension (dimension),
+    INDEX idx_score (score_min, score_max)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='方案生成规则';
+
+-- 家庭访问安全日志表
+CREATE TABLE IF NOT EXISTS family_access_logs (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL COMMENT '访问方用户ID',
+    family_id BIGINT NOT NULL COMMENT '被访问的家庭ID',
+    request_uri VARCHAR(500) NOT NULL COMMENT '请求路径',
+    request_method VARCHAR(10) NOT NULL,
+    access_type VARCHAR(20) NOT NULL COMMENT 'check_type: query/path/body',
+    result VARCHAR(10) NOT NULL COMMENT 'allowed/denied/log_only',
+    client_ip VARCHAR(50),
+    user_agent VARCHAR(500),
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_user_time (user_id, created_at),
+    INDEX idx_family_time (family_id, created_at)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭访问安全日志';
+
+-- 五维能量分数历史记录表
+CREATE TABLE IF NOT EXISTS five_dimension_scores (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT NOT NULL COMMENT '成员ID(user或family_member)',
+    member_type VARCHAR(20) NOT NULL COMMENT '成员类型: user/member',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    dimension_code VARCHAR(20) NOT NULL COMMENT '维度编码: body/mind/wisdom/action/wealth',
+    score INT NOT NULL COMMENT '分数(0-100)',
+    assessed_at DATETIME NOT NULL COMMENT '评估时间',
+    source_type VARCHAR(50) COMMENT '来源类型: periodic/task/assessment/manual',
+    source_id BIGINT COMMENT '来源记录ID',
+    detail_json TEXT COMMENT '详细数据JSON',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    INDEX idx_member_dim (member_id, member_type, dimension_code),
+    INDEX idx_family_time (family_id, assessed_at),
+    INDEX idx_source (source_type, source_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='五维能量分数历史记录';
+
+-- 家庭邀请令牌表
+CREATE TABLE IF NOT EXISTS family_invitations (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    token VARCHAR(64) NOT NULL UNIQUE COMMENT '邀请令牌(UUID)',
+    created_by BIGINT NOT NULL COMMENT '创建人用户ID',
+    status VARCHAR(16) DEFAULT 'active' COMMENT '状态: active/used/expired/revoked',
+    expires_at DATETIME COMMENT '过期时间',
+    max_use_count INT DEFAULT 1 COMMENT '最大使用次数',
+    used_count INT DEFAULT 0 COMMENT '已使用次数',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_family_id (family_id),
+    INDEX idx_token (token),
+    INDEX idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭邀请令牌';
+
+-- 规划师绑定家庭申请表
+CREATE TABLE IF NOT EXISTS teacher_family_binding_requests (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    teacher_id BIGINT NOT NULL COMMENT '规划师用户ID',
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    invitation_token VARCHAR(128) COMMENT '关联邀请码/令牌',
+    status VARCHAR(20) NOT NULL DEFAULT 'pending' COMMENT 'pending/approved/rejected/cancelled',
+    requested_at DATETIME COMMENT '申请时间',
+    decided_by BIGINT COMMENT '审批人用户ID',
+    decided_at DATETIME COMMENT '审批时间',
+    reject_reason VARCHAR(200) COMMENT '拒绝原因',
+    message VARCHAR(500) COMMENT '申请留言',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_teacher_family (teacher_id, family_id),
+    INDEX idx_family_status (family_id, status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='规划师绑定家庭申请表';
+
+-- Dify会话本地镜像表
+CREATE TABLE IF NOT EXISTS chat_conversations (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL,
+    dify_conversation_id VARCHAR(64),
+    assistant_type VARCHAR(32) COMMENT 'family/nutrition/tongue',
+    title VARCHAR(200),
+    last_message_at DATETIME,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_dify_conv (dify_conversation_id),
+    INDEX idx_user (user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Dify会话本地镜像';
+
+CREATE TABLE IF NOT EXISTS chat_messages (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    conversation_id BIGINT NOT NULL,
+    dify_message_id VARCHAR(64),
+    role VARCHAR(20) NOT NULL COMMENT 'user/assistant',
+    content TEXT NOT NULL,
+    inputs_json TEXT,
+    metadata TEXT,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_conv (conversation_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Dify消息本地镜像';
+
+-- 迁移版本追踪表
+CREATE TABLE IF NOT EXISTS schema_versions (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    version_code VARCHAR(64) NOT NULL UNIQUE,
+    description VARCHAR(500),
+    checksum VARCHAR(64),
+    applied_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    applied_by VARCHAR(100)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='迁移版本追踪表';
+
+
+-- 待退款记录表
+CREATE TABLE IF NOT EXISTS pending_refund (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    withdrawal_request_id BIGINT COMMENT '提现申请ID',
+    amount INT NOT NULL COMMENT '退款金额(分)',
+    attempt_count INT DEFAULT 0 COMMENT '当前尝试次数',
+    max_attempts INT DEFAULT 10 COMMENT '最大重试次数',
+    next_retry_time DATETIME COMMENT '下次重试时间',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/processing/success/failed',
+    failure_reason VARCHAR(500) COMMENT '失败原因',
+    refunded_amount INT COMMENT '实际退款金额(分)',
+    refunded_at DATETIME COMMENT '退款时间',
+    remark VARCHAR(500) COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    INDEX idx_user_id (user_id),
+    INDEX idx_status (status),
+    INDEX idx_next_retry (next_retry_time),
+    INDEX idx_withdrawal_request (withdrawal_request_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='待退款记录表';
+
+
+-- 家庭每日运势表(迁移 79)
+CREATE TABLE IF NOT EXISTS tianpan_daily_fortune (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL COMMENT '家庭ID',
+    date VARCHAR(20) NOT NULL COMMENT '日期 YYYY-MM-DD',
+    lunar_date VARCHAR(50) COMMENT '农历日期',
+    day_ganzhi VARCHAR(10) COMMENT '日柱',
+    five_elements_main VARCHAR(20) COMMENT '当日五行主气',
+    five_elements_detail VARCHAR(100) COMMENT '五行详情',
+    auspicious TEXT COMMENT '宜做的事(JSON数组)',
+    inauspicious TEXT COMMENT '忌做的事(JSON数组)',
+    family_advice TEXT COMMENT '家庭建议',
+    focus_member_name VARCHAR(50) COMMENT '关注成员',
+    focus_member_tip TEXT COMMENT '成员提示',
+    wuxing_tip TEXT COMMENT '五行提示',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_family_date (family_id, date),
+    INDEX idx_family_id (family_id),
+    INDEX idx_date (date)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭每日运势表';
+
+
+-- 成员年度能量表(迁移 80)
+CREATE TABLE IF NOT EXISTS tianpan_member_annual_energy (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT NOT NULL COMMENT '成员ID',
+    year INT NOT NULL COMMENT '年份',
+    dimensions_body INT DEFAULT 0 COMMENT '身能量',
+    dimensions_mind INT DEFAULT 0 COMMENT '心能量',
+    dimensions_wisdom INT DEFAULT 0 COMMENT '智能量',
+    dimensions_action INT DEFAULT 0 COMMENT '行能量',
+    dimensions_wealth INT DEFAULT 0 COMMENT '富能量',
+    jupiter_phase VARCHAR(50) COMMENT '木星相位',
+    saturn_phase VARCHAR(50) COMMENT '土星相位',
+    highlights TEXT COMMENT '年度亮点(JSON数组)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_member_year (member_id, year),
+    INDEX idx_member_id (member_id),
+    INDEX idx_year (year)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='成员年度能量表';
+
+-- 商品推荐日志表(迁移 80)
+CREATE TABLE IF NOT EXISTS product_recommendation_log (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT COMMENT '用户 ID',
+    product_id BIGINT COMMENT '商品 ID',
+    scene VARCHAR(32) COMMENT '触发场景:report_upload/manual/chat',
+    reason VARCHAR(255) COMMENT '推荐理由',
+    match_score DOUBLE COMMENT '匹配分',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_user_id (user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品推荐日志';
+
+-- 商品维度关联表(迁移 81)
+CREATE TABLE IF NOT EXISTS product_dimension_mapping (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    product_id BIGINT NOT NULL COMMENT '商品 ID',
+    dimension_code VARCHAR(32) NOT NULL COMMENT '维度: body/wisdom/mind/action/wealth',
+    match_score INT DEFAULT 100 COMMENT '匹配度 0-100',
+    match_reason VARCHAR(200) COMMENT '匹配原因',
+    tags VARCHAR(500) COMMENT '推荐标签 JSON',
+    enabled TINYINT DEFAULT 1,
+    created_at DATETIME,
+    updated_at DATETIME,
+    INDEX idx_product (product_id),
+    INDEX idx_dimension (dimension_code)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品维度关联表';
+
+-- 复购提醒发送记录表(迁移 82)
+CREATE TABLE IF NOT EXISTS repurchase_reminder_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL,
+    product_id BIGINT NOT NULL,
+    order_id BIGINT COMMENT '关联订单 ID',
+    reminder_days INT DEFAULT 30,
+    sent_at DATETIME,
+    clicked TINYINT DEFAULT 0,
+    purchased TINYINT DEFAULT 0,
+    INDEX idx_user_pending (user_id, purchased)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='复购提醒发送记录';
+
+-- 复购提醒配置表(迁移 83)
+CREATE TABLE IF NOT EXISTS repurchase_reminder_config (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    product_category VARCHAR(100),
+    product_id BIGINT COMMENT '特定商品 ID(优先于 category)',
+    reminder_days INT DEFAULT 30,
+    reminder_template VARCHAR(500) COMMENT '提醒话术模板',
+    max_reminders INT DEFAULT 3,
+    enabled TINYINT DEFAULT 1,
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='复购提醒配置表';
+
+-- products 表添加推荐相关字段(迁移 81-83)
+ALTER TABLE products ADD COLUMN IF NOT EXISTS recommendation_tags VARCHAR(500) COMMENT '推荐标签 JSON' AFTER domain;
+ALTER TABLE products ADD COLUMN IF NOT EXISTS purchase_count_threshold INT DEFAULT 0;
+ALTER TABLE products ADD COLUMN IF NOT EXISTS repurchase_interval_days INT DEFAULT 30;
+
+-- 社交圈/珍珠表(迁移 85)
+CREATE TABLE IF NOT EXISTS social_circle (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  name VARCHAR(100) NOT NULL COMMENT '圈子名称',
+  type VARCHAR(50) NOT NULL COMMENT '类型: topic/activity/hobby/ability/product/health/provider',
+  match_source VARCHAR(50) NOT NULL COMMENT '匹配源: article/activity/game/assessment/product/health_report/teacher',
+  source_id BIGINT COMMENT '匹配源ID',
+  member_count INT DEFAULT 0 COMMENT '成员数',
   created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
-  updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  INDEX idx_family_id_date (family_id, fortune_date)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭运势数据';
+  INDEX idx_type (type),
+  INDEX idx_match_source (match_source),
+  INDEX idx_source_id (source_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='社交圈/珍珠';
+
+-- 社交圈成员表(迁移 85)
+CREATE TABLE IF NOT EXISTS social_circle_member (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  circle_id BIGINT NOT NULL,
+  member_id BIGINT NOT NULL COMMENT '用户ID',
+  member_type VARCHAR(20) NOT NULL COMMENT 'parent/child',
+  joined_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+  UNIQUE KEY uk_circle_member (circle_id, member_id),
+  INDEX idx_member (member_id, member_type),
+  INDEX idx_circle_id (circle_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='圈子成员';
+
+-- AI对话摘要
+CREATE TABLE IF NOT EXISTS ai_conversation_summary (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  user_id BIGINT NOT NULL COMMENT '用户ID',
+  conversation_id VARCHAR(100) NOT NULL COMMENT 'Dify会话ID',
+  summary_text TEXT COMMENT '对话摘要文本',
+  summary_tokens INT DEFAULT 0 COMMENT '摘要token数',
+  message_count INT DEFAULT 0 COMMENT '本次对话消息数',
+  created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  INDEX idx_conversation (conversation_id),
+  INDEX idx_user (user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI对话摘要';
+
+-- AI用户关键事实
+CREATE TABLE IF NOT EXISTS ai_user_facts (
+  id BIGINT AUTO_INCREMENT PRIMARY KEY,
+  user_id BIGINT NOT NULL COMMENT '用户ID',
+  fact_key VARCHAR(100) NOT NULL COMMENT '事实键',
+  fact_value VARCHAR(500) COMMENT '事实值',
+  source_conversation VARCHAR(100) COMMENT '来源会话ID',
+  confidence DECIMAL(3,2) DEFAULT 1.00 COMMENT '置信度0-1',
+  created_at DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  INDEX idx_user_key (user_id, fact_key),
+  INDEX idx_conversation (source_conversation)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI用户关键事实';
+
+CREATE TABLE IF NOT EXISTS supply_hierarchy (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    system_id BIGINT NOT NULL COMMENT '供应商体系ID',
+    parent_id BIGINT NOT NULL COMMENT '上级供应商ID',
+    child_id BIGINT NOT NULL COMMENT '下级供应商ID',
+    level INT DEFAULT 1 COMMENT '层级深度',
+    status VARCHAR(20) DEFAULT 'active',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_system_parent_child (system_id, parent_id, child_id),
+    KEY idx_system_child (system_id, child_id),
+    KEY idx_parent (parent_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='供应商上下级关系表';
+
+CREATE TABLE IF NOT EXISTS supply_hierarchy_change_request (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    system_id BIGINT NOT NULL,
+    applicant_id BIGINT NOT NULL COMMENT '申请人ID',
+    target_parent_id BIGINT NOT NULL COMMENT '目标上级ID',
+    status VARCHAR(20) DEFAULT 'pending',
+    reason VARCHAR(500),
+    reject_reason VARCHAR(500),
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    reviewed_at DATETIME,
+    reviewed_by BIGINT,
+    KEY idx_system_applicant (system_id, applicant_id),
+    KEY idx_status (status)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='供应商更换上级申请表';
+
+CREATE TABLE IF NOT EXISTS butler_profiles (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT NOT NULL COMMENT '用户ID',
+    tier VARCHAR(10) COMMENT '服务等级: L1/L2',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/approved/rejected',
+    member_count INT DEFAULT 0 COMMENT '当前服务家庭数',
+    max_members INT DEFAULT 50 COMMENT '最大服务家庭上限',
+    annual_fee_l1 BIGINT COMMENT '年费L1档(P点)',
+    annual_fee_l2 BIGINT COMMENT '年费L2档(P点)',
+    description TEXT COMMENT '个人简介',
+    certificates TEXT COMMENT '资质证书URL(JSON数组)',
+    reject_reason VARCHAR(500) COMMENT '审核拒绝原因',
+    commission_rate_l1 INT DEFAULT 1000 COMMENT '年度分佣比例L1(basis points,10000=100%)',
+    commission_rate_l2 INT DEFAULT 5000 COMMENT '年度分佣比例L2(basis points,10000=100%)',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    approved_at DATETIME COMMENT '审核通过时间',
+    UNIQUE KEY uk_user_id (user_id),
+    INDEX idx_status (status),
+    INDEX idx_tier (tier)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='管家服务提供商档案';
+
+CREATE TABLE IF NOT EXISTS butler_service_records (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    butler_id BIGINT NOT NULL COMMENT '管家用户ID',
+    member_user_id BIGINT NOT NULL COMMENT '会员用户ID',
+    subscription_id BIGINT COMMENT '关联订阅记录ID(年费服务时)',
+    service_type VARCHAR(20) NOT NULL COMMENT '服务类型: annual/per_session',
+    amount_p BIGINT NOT NULL COMMENT '服务金额(P点)',
+    platform_fee_p BIGINT DEFAULT 0 COMMENT '平台留成(P点)',
+    butler_amount_p BIGINT DEFAULT 0 COMMENT '管家所得(P点)',
+    member_tier VARCHAR(10) COMMENT '会员订阅级别: L1/L2',
+    year_month VARCHAR(7) COMMENT '结算年月 YYYY-MM',
+    remark VARCHAR(500) COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_butler_id (butler_id),
+    INDEX idx_member_user_id (member_user_id),
+    INDEX idx_year_month (year_month),
+    INDEX idx_service_type (service_type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='管家服务记录';
+
+CREATE TABLE IF NOT EXISTS butler_commission_settlements (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    butler_id BIGINT NOT NULL COMMENT '管家用户ID',
+    year_month VARCHAR(7) NOT NULL COMMENT '结算年月 YYYY-MM',
+    member_count INT DEFAULT 0 COMMENT '本月服务家庭数',
+    annual_base_amount_p BIGINT DEFAULT 0 COMMENT '年费基准总额(P点)',
+    annual_butler_amount_p BIGINT DEFAULT 0 COMMENT '年费-管家所得(P点)',
+    annual_platform_amount_p BIGINT DEFAULT 0 COMMENT '年费-平台留成(P点)',
+    per_session_total_p BIGINT DEFAULT 0 COMMENT '按次服务总金额(P点)',
+    per_session_platform_total_p BIGINT DEFAULT 0 COMMENT '按次-平台留成(P点)',
+    per_session_butler_total_p BIGINT DEFAULT 0 COMMENT '按次-管家所得(P点)',
+    total_butler_amount_p BIGINT DEFAULT 0 COMMENT '本月管家总所得(P点)',
+    status VARCHAR(20) DEFAULT 'pending' COMMENT '结算状态: pending/paid',
+    settled_at DATETIME COMMENT '确认发放时间',
+    settled_by BIGINT COMMENT '结算确认人',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE KEY uk_butler_month (butler_id, year_month),
+    INDEX idx_status (status),
+    INDEX idx_year_month (year_month)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='管家月度佣金结算单';
+
+-- 家庭公共账户体系
+
+CREATE TABLE family_earnings (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL UNIQUE COMMENT '家庭ID',
+    total_earned BIGINT NOT NULL DEFAULT 0 COMMENT '累计推荐收入(分)',
+    available_amount BIGINT NOT NULL DEFAULT 0 COMMENT '当前可支配余额(分)',
+    withdrawn_amount BIGINT NOT NULL DEFAULT 0 COMMENT '已提现金额(分)',
+    distributed_amount BIGINT NOT NULL DEFAULT 0 COMMENT '已颁发给成员的金额(分)',
+    updated_at DATETIME,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_family_id (family_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭公共账户';
+
+CREATE TABLE family_earnings_member (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL,
+    user_id BIGINT NOT NULL,
+    allocated_amount BIGINT NOT NULL DEFAULT 0 COMMENT '管理员累计分配(分)',
+    consumed_amount BIGINT NOT NULL DEFAULT 0 COMMENT '已消费金额(分)',
+    available_amount BIGINT NOT NULL DEFAULT 0 COMMENT '可消费余额=allocated-consumed(分)',
+    can_use_family_balance TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否允许使用家庭公共池',
+    updated_at DATETIME,
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    UNIQUE KEY idx_family_user (family_id, user_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭成员已分配余额';
+
+CREATE TABLE family_earnings_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT NOT NULL,
+    type VARCHAR(20) NOT NULL COMMENT '类型: earn收入/withdraw提现/distribute颁发/consume消费',
+    amount BIGINT NOT NULL COMMENT '金额(分)',
+    from_user_id BIGINT COMMENT '操作人',
+    to_user_id BIGINT COMMENT '受益人(颁发/消费时填写)',
+    note VARCHAR(255) COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_family_id (family_id),
+    INDEX idx_type (type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭收益收支流水';
+
+ALTER TABLE commission_records ADD COLUMN family_id BIGINT COMMENT '归属家庭ID';
+
+
+-- ========== Schema.sql 补充: 从 DatabaseInitializer 同步的表 ==========
+
+-- after_sales_requests
+
+CREATE TABLE IF NOT EXISTS after_sales_requests (id BIGINT AUTO_INCREMENT PRIMARY KEY,order_id BIGINT NOT NULL COMMENT '订单ID',order_no VARCHAR(32) NOT NULL COMMENT '订单号',user_id BIGINT NOT NULL COMMENT '用户ID',type VARCHAR(32) NOT NULL COMMENT '类型: REFUND/RETURN_REFUND',reason VARCHAR(255) COMMENT '原因',description TEXT COMMENT '描述',images TEXT COMMENT '凭证图片(JSON数组)',refund_amount INT DEFAULT 0 COMMENT '退款金额(分)',status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/approved/rejected/completed',reject_reason VARCHAR(255) COMMENT '驳回原因',handled_by BIGINT COMMENT '处理人ID',handled_at DATETIME COMMENT '处理时间',created_at DATETIME DEFAULT CURRENT_TIMESTAMP,updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,INDEX idx_order (order_id),INDEX idx_user (user_id),INDEX idx_status (status)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='售后申请';
+
+-- article_reading_records
+
+CREATE TABLE IF NOT EXISTS article_reading_records (id BIGINT AUTO_INCREMENT PRIMARY KEY, user_id BIGINT COMMENT '用户ID', child_id BIGINT NOT NULL COMMENT '孩子ID', content VARCHAR(500) COMMENT '阅读内容摘要', duration_seconds INT DEFAULT 0 COMMENT '阅读时长(秒)', read_at DATETIME COMMENT '阅读时间', created_at DATETIME, INDEX idx_child_id (child_id), INDEX idx_read_at (read_at)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文章阅读记录表';
+
+-- bazi_reading_template
+
+CREATE TABLE IF NOT EXISTS bazi_reading_template (id BIGINT AUTO_INCREMENT PRIMARY KEY, element VARCHAR(20) NOT NULL COMMENT '五行: wood/fire/earth/metal/water', condition VARCHAR(20) NOT NULL COMMENT '状态: strong/weak/balanced', personal_trait TEXT COMMENT '性格特质描述', mind_growth_advice TEXT COMMENT '心理成长建议', daily_tip_template TEXT COMMENT '每日宜忌模板', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY uk_element_condition (element, condition)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='五行命理解读模板';
+
+-- cart_items
+
+CREATE TABLE IF NOT EXISTS cart_items (id BIGINT AUTO_INCREMENT PRIMARY KEY,user_id BIGINT NOT NULL COMMENT '用户ID',product_id BIGINT NOT NULL COMMENT '商品ID',quantity INT DEFAULT 1 COMMENT '数量',selected TINYINT(1) DEFAULT 1 COMMENT '是否选中',created_at DATETIME DEFAULT CURRENT_TIMESTAMP,updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,INDEX idx_user (user_id),INDEX idx_product (product_id),UNIQUE KEY uk_user_product (user_id, product_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='购物车';
+
+-- contacts
+
+CREATE TABLE IF NOT EXISTS contacts (id BIGINT AUTO_INCREMENT PRIMARY KEY, user_id BIGINT NOT NULL COMMENT '用户ID', name VARCHAR(100) NOT NULL COMMENT '姓名', phone VARCHAR(20) COMMENT '电话', avatar VARCHAR(500) COMMENT '头像', relationship_type VARCHAR(20) COMMENT '关系类型: family/friend/partner/colleague/other', known_since DATETIME COMMENT '认识时间', bio VARCHAR(500) COMMENT '简介', birthday DATE COMMENT '生日', intimacy_level INT DEFAULT 0 COMMENT '亲密度(0-100)', contact_source VARCHAR(20) DEFAULT 'manual' COMMENT '来源: phone/manual', tags VARCHAR(500) COMMENT '标签(逗号分隔)', last_contact_at DATETIME COMMENT '最近联系时间', contact_count INT DEFAULT 0 COMMENT '联系次数', notes TEXT COMMENT '备注', family_member_id BIGINT DEFAULT NULL COMMENT '关联的家庭成员ID', invited_status VARCHAR(16) DEFAULT 'none' COMMENT '邀请加入家庭状态: none/invited/accepted/declined', created_at DATETIME, updated_at DATETIME, INDEX idx_user_id (user_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='联系人表';
+
+-- family_member_logs
+
+CREATE TABLE IF NOT EXISTS family_member_logs (id BIGINT AUTO_INCREMENT PRIMARY KEY, family_id BIGINT NOT NULL COMMENT '家庭ID', member_id BIGINT NOT NULL COMMENT '成员ID', action VARCHAR(32) NOT NULL COMMENT '操作: join/leave/update/kick', old_value VARCHAR(500) COMMENT '旧值', new_value VARCHAR(500) COMMENT '新值', operator_id BIGINT COMMENT '操作人用户ID', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_family_id (family_id), INDEX idx_member_id (member_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭成员变更日志';
+
+-- dan_knowledge_base
+
+CREATE TABLE IF NOT EXISTS dan_knowledge_base (id BIGINT PRIMARY KEY AUTO_INCREMENT, title VARCHAR(200) NOT NULL COMMENT '知识标题', content TEXT NOT NULL COMMENT '知识内容', sort INT DEFAULT 0 COMMENT '排序', status TINYINT(1) DEFAULT 1 COMMENT '状态: 0禁用 1启用', remark VARCHAR(500) COMMENT '备注', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='知识库表';
+
+-- dan_knowledge_base_dimension
+
+CREATE TABLE IF NOT EXISTS dan_knowledge_base_dimension (id BIGINT PRIMARY KEY AUTO_INCREMENT, knowledge_id BIGINT NOT NULL COMMENT '知识库ID', dimension_id BIGINT NOT NULL COMMENT '维度配置ID', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY uk_knowledge_dimension (knowledge_id, dimension_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='知识-维度关联表';
+
+-- dan_knowledge_base_tag
+
+CREATE TABLE IF NOT EXISTS dan_knowledge_base_tag (id BIGINT PRIMARY KEY AUTO_INCREMENT, knowledge_id BIGINT NOT NULL, tag_id BIGINT NOT NULL, created_at DATETIME DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY uk_knowledge_tag (knowledge_id, tag_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='知识-标签关联表';
+
+-- dan_knowledge_tag
+
+CREATE TABLE IF NOT EXISTS dan_knowledge_tag (id BIGINT PRIMARY KEY AUTO_INCREMENT, tag_name VARCHAR(100) NOT NULL UNIQUE COMMENT '标签名', tag_type VARCHAR(50) DEFAULT 'custom' COMMENT '标签类型: custom/auto', created_at DATETIME DEFAULT CURRENT_TIMESTAMP ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='标签表';
+
+-- distribution_relations
+
+CREATE TABLE IF NOT EXISTS distribution_relations (id BIGINT AUTO_INCREMENT PRIMARY KEY,system_id BIGINT NOT NULL COMMENT '体系ID',user_id BIGINT NOT NULL COMMENT '用户ID',parent_id BIGINT COMMENT '上级用户ID(null=根)',depth INT DEFAULT 0 COMMENT '层级深度',created_at DATETIME DEFAULT CURRENT_TIMESTAMP,INDEX idx_system (system_id),INDEX idx_user (user_id),INDEX idx_parent (parent_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='销售关系';
+
+-- distribution_systems
+
+CREATE TABLE IF NOT EXISTS distribution_systems (id BIGINT AUTO_INCREMENT PRIMARY KEY,name VARCHAR(64) NOT NULL COMMENT '体系名称',description VARCHAR(255) COMMENT '描述',owner_id BIGINT COMMENT '创建者ID',profit_rate INT DEFAULT 0 COMMENT '平台利润率(千分比)',enabled TINYINT(1) DEFAULT 1 COMMENT '启用',created_at DATETIME DEFAULT CURRENT_TIMESTAMP,updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='销售体系';
+
+-- emotion_checkin
+
+CREATE TABLE IF NOT EXISTS emotion_checkin (id BIGINT AUTO_INCREMENT PRIMARY KEY, child_id BIGINT NOT NULL COMMENT '孩子ID', user_id BIGINT NOT NULL COMMENT '打卡人用户ID', emotion_type INT NOT NULL COMMENT '情绪类型: 1快乐/2平和平静/3平静/4有点不舒服/5难受/6烦躁/7生气/8焦虑/9恐惧', emotion_name VARCHAR(20) COMMENT '情绪名称: happy/calm/peaceful/uncomfortable/sad/irritable/angry/anxious/fearful', energy_level INT NOT NULL DEFAULT 3 COMMENT '能量状态: 1很低/2低/3中等/4高/5很高', note TEXT COMMENT '打卡备注', photo_url VARCHAR(500) COMMENT '照片URL', favorite_thing VARCHAR(500) COMMENT '今日最喜欢的一件事', points_awarded INT DEFAULT 0 COMMENT '奖励积分', parent_visible TINYINT DEFAULT 1 COMMENT '家长可见: 1可见/0不可见', checkin_date DATE NOT NULL COMMENT '打卡日期', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, INDEX idx_child_id (child_id), INDEX idx_user_id (user_id), INDEX idx_checkin_date (checkin_date), INDEX idx_child_date (child_id, checkin_date)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='情绪打卡表';
+
+-- health_checkins
+
+CREATE TABLE IF NOT EXISTS health_checkins (id BIGINT AUTO_INCREMENT PRIMARY KEY, user_id BIGINT COMMENT '用户ID(家长)', child_id BIGINT COMMENT '孩子ID', checkin_date DATE COMMENT '打卡日期', behaviors TEXT COMMENT '打卡行为JSON数组', note VARCHAR(500) COMMENT '备注', mood VARCHAR(20) COMMENT '心情: happy/normal/sad/angry/sick', earned_energy INT DEFAULT 5 COMMENT '获得能量值', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_child_id (child_id), INDEX idx_checkin_date (checkin_date)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='健康打卡表';
+
+-- health_disease_risk
+
+CREATE TABLE IF NOT EXISTS health_disease_risk (id BIGINT AUTO_INCREMENT PRIMARY KEY, report_id BIGINT NOT NULL COMMENT '关联报告ID', disease_name VARCHAR(100) NOT NULL COMMENT '疾病名称', risk_value VARCHAR(50) COMMENT '风险值(0-1)', risk_level VARCHAR(20) COMMENT '风险等级: 高风险/需注意/低风险', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_report (report_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='疾病风险评估数据';
+
+-- health_gut_flora
+
+CREATE TABLE IF NOT EXISTS health_gut_flora (id BIGINT AUTO_INCREMENT PRIMARY KEY, report_id BIGINT NOT NULL COMMENT '关联报告ID', bacteria_name VARCHAR(100) NOT NULL COMMENT '菌种名称', bacteria_value VARCHAR(50) COMMENT '菌种丰度值', normal_range VARCHAR(100) COMMENT '正常范围', status VARCHAR(20) COMMENT '状态: 正常/偏低/偏高', category VARCHAR(50) COMMENT '分类: 有益菌/有害菌/中性菌', sort_order INT DEFAULT 0 COMMENT '排序', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_report (report_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='菌群检测专项数据';
+
+-- health_report_survey
+
+CREATE TABLE IF NOT EXISTS health_report_survey (id BIGINT AUTO_INCREMENT PRIMARY KEY, report_id BIGINT NOT NULL COMMENT '关联报告ID', user_id BIGINT NOT NULL COMMENT '用户ID', child_id BIGINT NOT NULL COMMENT '孩子ID', survey_data JSON COMMENT '调研问卷结果JSON', status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/completed', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, UNIQUE KEY uk_report (report_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='报告调研问卷';
+
+-- numsoul_config
+
+CREATE TABLE IF NOT EXISTS numsoul_config (number INT PRIMARY KEY COMMENT '灵数1-9', title VARCHAR(50) NOT NULL COMMENT '称号', keywords VARCHAR(200) COMMENT '性格关键词', mind_growth_advice TEXT COMMENT '心理成长建议', recommended_article_tags VARCHAR(200) COMMENT '关联文章标签', color_hex VARCHAR(7) COMMENT '代表色' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生命灵数配置';
+
+-- nutrition_deficiency_record
+
+CREATE TABLE IF NOT EXISTS nutrition_deficiency_record (id BIGINT AUTO_INCREMENT PRIMARY KEY,child_id BIGINT NOT NULL COMMENT '孩子ID',report_id BIGINT NOT NULL COMMENT '关联报告ID',nutrient VARCHAR(50) NOT NULL COMMENT '营养素名',deficiency_type VARCHAR(20) NOT NULL COMMENT 'deficiency/excess/borderline/unclassified',severity DECIMAL(5,2) DEFAULT 0 COMMENT '严重程度(0-1)',indicator_name VARCHAR(100) COMMENT '关联指标名',indicator_value VARCHAR(50) COMMENT '指标检测值',ref_range VARCHAR(100) COMMENT '参考范围',symptoms TEXT COMMENT '症状描述',food_suggestions TEXT COMMENT '推荐食物',created_at DATETIME DEFAULT CURRENT_TIMESTAMP,INDEX idx_child (child_id),INDEX idx_report (report_id),INDEX idx_nutrient (nutrient)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='营养缺乏分析记录';
+
+-- nutrition_indicator_mapping
+
+CREATE TABLE IF NOT EXISTS nutrition_indicator_mapping (id BIGINT AUTO_INCREMENT PRIMARY KEY,indicator_name_pattern VARCHAR(200) NOT NULL COMMENT '指标名匹配模式(SQL LIKE语法,%为通配符)',nutrient VARCHAR(50) NOT NULL COMMENT '关联营养素名',severity_weight DECIMAL(3,2) DEFAULT 1.00 COMMENT '权重(0-1)',deficiency_symptoms TEXT COMMENT '缺乏症状描述',excess_symptoms TEXT COMMENT '过量症状描述',food_suggestions TEXT COMMENT '推荐食物(逗号分隔)',sort_order INT DEFAULT 0 COMMENT '排序(大值优先匹配)',created_at DATETIME DEFAULT CURRENT_TIMESTAMP,updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,INDEX idx_nutrient (nutrient)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='指标-营养素映射表';
+
+-- product_dimension_config
+
+CREATE TABLE IF NOT EXISTS product_dimension_config (id BIGINT PRIMARY KEY AUTO_INCREMENT, dimension_code VARCHAR(50) NOT NULL UNIQUE COMMENT '维度代码: body/mind/wisdom/action/wealth', dimension_name VARCHAR(100) NOT NULL COMMENT '维度名称', dimension_type VARCHAR(50) NOT NULL DEFAULT 'five' COMMENT '类型: five(五维)/action(行动)/other', parent_id BIGINT COMMENT '父级ID,无父级为NULL', sort INT DEFAULT 0 COMMENT '排序', enabled TINYINT(1) DEFAULT 1 COMMENT '启用: 0禁用 1启用', dify_dataset_id VARCHAR(100) COMMENT 'Dify Dataset ID,不填则不同步', remark VARCHAR(500) COMMENT '备注', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='维度配置表';
+
+-- promotion_tier_config
+
+CREATE TABLE IF NOT EXISTS promotion_tier_config (id BIGINT AUTO_INCREMENT PRIMARY KEY, tier_code VARCHAR(10) NOT NULL UNIQUE COMMENT '等级编码: R0/R1/R2/R3/R4', tier_name VARCHAR(50) NOT NULL COMMENT '等级名称', min_team_size_1st INT NOT NULL DEFAULT 0 COMMENT '一级团队人数下限', min_team_size_2nd INT NOT NULL DEFAULT 0 COMMENT '二级团队人数下限', min_total_referral_earnings INT NOT NULL DEFAULT 0 COMMENT '累计推荐佣金下限(分)', min_total_share_earnings INT NOT NULL DEFAULT 0 COMMENT '累计消费返利下限(分)', commission_rate_l1 INT NOT NULL DEFAULT 0 COMMENT 'L1佣金比例(%)', commission_rate_l2 INT NOT NULL DEFAULT 0 COMMENT 'L2佣金比例(%)', sort_order INT NOT NULL DEFAULT 0 COMMENT '排序', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='推广等级阈值配置';
+
+-- shop_categories
+
+CREATE TABLE IF NOT EXISTS shop_categories (id BIGINT AUTO_INCREMENT PRIMARY KEY,name VARCHAR(64) NOT NULL COMMENT '分类名称',parent_id BIGINT DEFAULT 0 COMMENT '父分类ID(0=根节点)',level INT DEFAULT 0 COMMENT '层级(0/1/2/3)',sort INT DEFAULT 0 COMMENT '排序',image VARCHAR(512) COMMENT '分类图标',enabled TINYINT(1) DEFAULT 1 COMMENT '启用',dimension_codes VARCHAR(128) COMMENT '维度编码(逗号分隔: body,mind,heart)',product_types VARCHAR(128) COMMENT '商品类型(逗号分隔: PHYSICAL,COURSE,ASSESSMENT)',created_at DATETIME DEFAULT CURRENT_TIMESTAMP,updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,INDEX idx_parent (parent_id),INDEX idx_sort (sort)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品类目';
+
+-- shop_discount_rules
+
+CREATE TABLE IF NOT EXISTS shop_discount_rules (id BIGINT AUTO_INCREMENT PRIMARY KEY,name VARCHAR(64) NOT NULL COMMENT '规则名称',type VARCHAR(32) NOT NULL COMMENT '类型: PERCENT/FIXED/THRESHOLD',value INT NOT NULL COMMENT '折扣值(PERCENT=百分比数字, FIXED/THRESHOLD=金额分)',threshold_amount INT COMMENT '满减门槛(分,仅THRESHOLD)',category_id BIGINT COMMENT '适用类目ID(null=全部)',distribution_system_id BIGINT COMMENT '适用体系ID(null=全部)',product_ids TEXT COMMENT '适用商品ID(逗号分隔,null=全部)',start_time DATETIME COMMENT '开始时间',end_time DATETIME COMMENT '结束时间',max_uses INT DEFAULT 0 COMMENT '最大使用次数(0=不限)',used_count INT DEFAULT 0 COMMENT '已使用次数',enabled TINYINT(1) DEFAULT 1 COMMENT '启用',created_at DATETIME DEFAULT CURRENT_TIMESTAMP,updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,INDEX idx_category (category_id),INDEX idx_enabled (enabled)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='折扣规则';
+
+-- trial_memberships
+
+CREATE TABLE IF NOT EXISTS trial_memberships (id BIGINT AUTO_INCREMENT PRIMARY KEY, user_id BIGINT NOT NULL COMMENT '用户ID', family_id BIGINT NOT NULL COMMENT '家庭ID', start_date DATETIME NOT NULL COMMENT '试用开始时间', end_date DATETIME NOT NULL COMMENT '试用结束时间', status VARCHAR(20) DEFAULT 'PENDING' COMMENT '状态:PENDING/ACTIVE/EXPIRED/CONVERTED', trial_days INT DEFAULT 7 COMMENT '试用天数', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, INDEX idx_user_id (user_id), INDEX idx_family_id (family_id), INDEX idx_status (status), INDEX idx_end_date (end_date)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- user_profile_history
+
+CREATE TABLE IF NOT EXISTS user_profile_history (id BIGINT AUTO_INCREMENT PRIMARY KEY, user_id BIGINT NOT NULL COMMENT '用户ID', field_name VARCHAR(64) NOT NULL COMMENT '变更字段名', old_value TEXT COMMENT '旧值', new_value TEXT COMMENT '新值', source VARCHAR(32) DEFAULT 'user' COMMENT '变更来源: user/admin/auto', changed_at DATETIME NOT NULL COMMENT '变更时间', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_ph_user (user_id), INDEX idx_ph_field (field_name), INDEX idx_ph_changed (changed_at) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户信息变更历史表';
+
+-- follow_up
+
+CREATE TABLE IF NOT EXISTS follow_up (id BIGINT AUTO_INCREMENT PRIMARY KEY, family_id BIGINT NOT NULL COMMENT '家庭ID', child_id BIGINT COMMENT '孩子ID', teacher_id BIGINT COMMENT '规划师ID', deficiency_id BIGINT COMMENT '缺乏项ID', message_id BIGINT COMMENT '消息ID', status VARCHAR(20) DEFAULT 'pending' COMMENT '状态', priority VARCHAR(10) DEFAULT 'medium' COMMENT '优先级', description VARCHAR(500) COMMENT '描述', parent_feedback TEXT COMMENT '家长反馈', teacher_review VARCHAR(500) COMMENT '规划师点评', due_date DATETIME COMMENT '截止日期', completed_at DATETIME COMMENT '完成时间', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, INDEX idx_family (family_id), INDEX idx_teacher (teacher_id), INDEX idx_status (status), INDEX idx_due (due_date);
+
+-- food_nutrients
+
+CREATE TABLE IF NOT EXISTS food_nutrients (id BIGINT AUTO_INCREMENT PRIMARY KEY, food_id BIGINT NOT NULL COMMENT '食材ID', nutrient_code VARCHAR(20) NOT NULL COMMENT '营养素编码', amount_per_100g DECIMAL(10,4) NOT NULL COMMENT '每100g含量', unit VARCHAR(20) NOT NULL COMMENT '单位', source VARCHAR(50) DEFAULT 'importer' COMMENT '数据来源', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, UNIQUE KEY uk_food_nutrient (food_id, nutrient_code), INDEX idx_nutrient (nutrient_code);
+
+-- foods
+
+CREATE TABLE IF NOT EXISTS foods (id BIGINT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(100) NOT NULL COMMENT '食材名称', category VARCHAR(50) COMMENT '分类: 蔬菜/水果/肉禽/水产/蛋奶/豆类/谷物/调味/其他', unit VARCHAR(20) DEFAULT 'g' COMMENT '计量单位', calories DECIMAL(8,2) COMMENT '热量(kcal/100g)', protein DECIMAL(8,2) COMMENT '蛋白质(g/100g)', fat DECIMAL(8,2) COMMENT '脂肪(g/100g)', carbs DECIMAL(8,2) COMMENT '碳水(g/100g)', fiber DECIMAL(8,2) COMMENT '膳食纤维(g/100g)', price_level TINYINT COMMENT '价格等级 1-5', nutrition_tags VARCHAR(500) COMMENT '营养标签JSON', suitable_for VARCHAR(200) COMMENT '适宜人群JSON', allergens VARCHAR(200) COMMENT '过敏原JSON', external_source VARCHAR(100) COMMENT '数据来源', external_id VARCHAR(100) COMMENT '外部ID', cover_image VARCHAR(500) COMMENT '食材图片', status VARCHAR(20) DEFAULT 'active', sort_order INT DEFAULT 0, created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, INDEX idx_category (category), INDEX idx_price (price_level);
+
+-- meal_logs
+
+CREATE TABLE IF NOT EXISTS meal_logs (id BIGINT AUTO_INCREMENT PRIMARY KEY, user_id BIGINT NOT NULL COMMENT '用户ID', child_id BIGINT COMMENT '孩子ID', meal_type VARCHAR(20) NOT NULL COMMENT '早餐/午餐/晚餐/加餐', meal_date DATE NOT NULL COMMENT '用餐日期', meal_time DATETIME COMMENT '具体时间', foods TEXT NOT NULL COMMENT '食物清单JSON', total_calories DECIMAL(8,2) COMMENT '总热量', total_protein DECIMAL(8,2) COMMENT '总蛋白质', total_fat DECIMAL(8,2) COMMENT '总脂肪', total_carbs DECIMAL(8,2) COMMENT '总碳水', total_fiber DECIMAL(8,2) COMMENT '总膳食纤维', note TEXT COMMENT '备注', images VARCHAR(1000) COMMENT '图片JSON', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_user_date (user_id, meal_date), INDEX idx_child_date (child_id, meal_date);
+
+-- product_skus
+
+CREATE TABLE IF NOT EXISTS product_skus (  id INT NOT NULL AUTO_INCREMENT,  product_id INT NOT NULL COMMENT '商品ID',  sku_code VARCHAR(64) NOT NULL COMMENT 'SKU编码',  specs JSON NOT NULL COMMENT '规格JSON',  price DECIMAL(10,2) NOT NULL COMMENT 'SKU价格',  stock INT NOT NULL DEFAULT 0 COMMENT '库存',  original_price DECIMAL(10,2) COMMENT '原价/划线价',  image VARCHAR(512) COMMENT 'SKU图片',  enabled TINYINT(1) NOT NULL DEFAULT 1,  create_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,  update_time DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,  PRIMARY KEY (id),  KEY idx_product_id (product_id)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品SKU';
+
+-- rdi_standards
+
+CREATE TABLE IF NOT EXISTS rdi_standards (id BIGINT AUTO_INCREMENT PRIMARY KEY, nutrient_code VARCHAR(20) NOT NULL COMMENT '营养素编码', age_group VARCHAR(10) NOT NULL COMMENT '年龄段', gender VARCHAR(6) DEFAULT 'all' COMMENT '性别', rdi_type VARCHAR(10) NOT NULL COMMENT '参考类型', amount DECIMAL(10,4) NOT NULL COMMENT '推荐量', unit VARCHAR(20) NOT NULL COMMENT '单位', source VARCHAR(100) COMMENT '数据来源', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY uk_rdi (nutrient_code, age_group, gender, rdi_type), INDEX idx_age (age_group);
+
+-- recipes
+
+CREATE TABLE IF NOT EXISTS recipes (id BIGINT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(200) NOT NULL COMMENT '食谱名称', meal_type VARCHAR(20) COMMENT '早餐/午餐/晚餐/加餐', description TEXT COMMENT '简介', ingredients TEXT NOT NULL COMMENT '食材清单JSON', steps TEXT COMMENT '烹饪步骤JSON', cook_time INT COMMENT '烹饪时间(分钟)', difficulty VARCHAR(20) COMMENT '难度: 简单/中等/困难', total_calories DECIMAL(8,2) COMMENT '总热量', total_protein DECIMAL(8,2) COMMENT '总蛋白质', total_fat DECIMAL(8,2) COMMENT '总脂肪', total_carbs DECIMAL(8,2) COMMENT '总碳水', total_fiber DECIMAL(8,2) COMMENT '总膳食纤维', suitable_for VARCHAR(200) COMMENT '适宜场景', nutrition_tags VARCHAR(500) COMMENT '营养标签', external_source VARCHAR(100), external_id VARCHAR(100), cover_image VARCHAR(500), status VARCHAR(20) DEFAULT 'active', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, INDEX idx_meal_type (meal_type), INDEX idx_cook_time (cook_time);
+
+-- report_food_suitability
+
+CREATE TABLE IF NOT EXISTS report_food_suitability (id BIGINT AUTO_INCREMENT PRIMARY KEY, report_id BIGINT NOT NULL COMMENT '健康报告ID', food_id BIGINT COMMENT '食材ID', food_name VARCHAR(100) NOT NULL COMMENT '食材名称', category VARCHAR(50) COMMENT '分类', score INT NOT NULL COMMENT '适宜度评分', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_report (report_id), INDEX idx_food (food_id);
+
+-- seasonal_foods
+
+CREATE TABLE IF NOT EXISTS seasonal_foods (id BIGINT AUTO_INCREMENT PRIMARY KEY, food_id BIGINT NOT NULL COMMENT '关联foods.id', month TINYINT NOT NULL COMMENT '月份 1-12', region VARCHAR(50) DEFAULT '全国' COMMENT '产地', peak_flag TINYINT DEFAULT 0 COMMENT '盛产标志', sort_order INT DEFAULT 0, created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_food_month (food_id, month), INDEX idx_month (month);
+
+-- shopping_list_items
+
+CREATE TABLE IF NOT EXISTS shopping_list_items (id BIGINT AUTO_INCREMENT PRIMARY KEY, list_id BIGINT NOT NULL COMMENT '购物清单ID', food_id BIGINT COMMENT '食材ID', food_name VARCHAR(100) NOT NULL COMMENT '食材名称', category VARCHAR(50) COMMENT '分类', quantity DECIMAL(8,2) DEFAULT 1 COMMENT '数量', unit VARCHAR(20) DEFAULT '份' COMMENT '单位', priority VARCHAR(10) DEFAULT 'medium' COMMENT '优先级', reason VARCHAR(200) COMMENT '推荐原因', score INT COMMENT '评分', source VARCHAR(20) COMMENT '来源', purchased TINYINT DEFAULT 0 COMMENT '是否已购', purchased_at DATETIME COMMENT '购买时间', sort_order INT DEFAULT 0 COMMENT '排序', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, INDEX idx_list (list_id), INDEX idx_purchased (purchased);
+
+-- shopping_lists
+
+CREATE TABLE IF NOT EXISTS shopping_lists (id BIGINT AUTO_INCREMENT PRIMARY KEY, user_id BIGINT NOT NULL COMMENT '用户ID', child_id BIGINT COMMENT '孩子ID', report_id BIGINT COMMENT '健康报告ID', title VARCHAR(200) COMMENT '标题', source VARCHAR(20) NOT NULL COMMENT '来源', status VARCHAR(20) DEFAULT 'active' COMMENT '状态', total_items INT DEFAULT 0 COMMENT '总项数', purchased_items INT DEFAULT 0 COMMENT '已购项数', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, INDEX idx_user (user_id), INDEX idx_report (report_id), INDEX idx_status (status);
+
+-- user_food_preference
+
+CREATE TABLE IF NOT EXISTS user_food_preference (id BIGINT AUTO_INCREMENT PRIMARY KEY, user_id BIGINT NOT NULL COMMENT '用户ID', food_id BIGINT COMMENT '食材ID', food_name VARCHAR(100) NOT NULL COMMENT '食材名称', score INT NOT NULL DEFAULT 0 COMMENT '评分', reason VARCHAR(500) COMMENT '原因', created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, INDEX idx_user (user_id);
+
+
+
+-- ========== Schema.sql 补充: 从 entity 反向生成的表 ==========
+
+-- article_quiz_records
+
+CREATE TABLE IF NOT EXISTS article_quiz_records (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    article_id BIGINT,
+    user_id BIGINT,
+    child_id BIGINT,
+    questions VARCHAR(255),
+    answers VARCHAR(255),
+    score INT,
+    points_earned INT,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- assessment_results
+
+CREATE TABLE IF NOT EXISTS assessment_results (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT,
+    teacher_id BIGINT,
+    appointment_id BIGINT,
+    attention_score INT,
+    focus_score INT,
+    memory_score INT,
+    logic_score INT,
+    overall_score INT,
+    assessment_date DATETIME,
+    duration_minutes INT,
+    analysis_report VARCHAR(255),
+    growth_suggestions VARCHAR(255),
+    next_review_date DATETIME,
+    status VARCHAR(255),
+    created_at DATETIME,
+    updated_at DATETIME,
+    child_name VARCHAR(255),
+    child_birthday DATETIME,
+    child_gender VARCHAR(255),
+    child_age INT,
+    school VARCHAR(255),
+    grade VARCHAR(255),
+    grade_class VARCHAR(255),
+    height INT,
+    weight INT,
+    family_status VARCHAR(255),
+    parent_degree VARCHAR(255),
+    nation VARCHAR(255),
+    province VARCHAR(255),
+    city VARCHAR(255),
+    district VARCHAR(255),
+    address VARCHAR(255),
+    single_child VARCHAR(255),
+    school_score VARCHAR(255),
+    urgent_name VARCHAR(255),
+    urgent_phone VARCHAR(255),
+    pics VARCHAR(255),
+    videos VARCHAR(255),
+    audio VARCHAR(255),
+    audio_url VARCHAR(255),
+    process_desc VARCHAR(255),
+    result_desc VARCHAR(255)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- cognitive_norms
+
+CREATE TABLE IF NOT EXISTS cognitive_norms (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    dimension_key VARCHAR(255),
+    gender VARCHAR(255),
+    age_min INT,
+    age_max INT,
+    percentile5 INT,
+    percentile25 INT,
+    percentile50 INT,
+    percentile75 INT,
+    percentile95 INT,
+    source VARCHAR(255),
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- contact_match_requests
+
+CREATE TABLE IF NOT EXISTS contact_match_requests (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    requester_id BIGINT,
+    target_user_id BIGINT,
+    contact_id BIGINT,
+    status VARCHAR(255),
+    message VARCHAR(255),
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- daily_checkin
+
+CREATE TABLE IF NOT EXISTS daily_checkin (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT,
+    checkin_date DATETIME,
+    diet_score INT,
+    exercise_score INT,
+    sleep_score INT,
+    water_intake INT,
+    mood_score INT,
+    weight_kg DECIMAL(10,2),
+    height_cm DECIMAL(10,2),
+    remark VARCHAR(255),
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- diet_meal_record
+
+CREATE TABLE IF NOT EXISTS diet_meal_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT,
+    checkin_id BIGINT,
+    meal_type VARCHAR(255),
+    food_name VARCHAR(255),
+    food_amount VARCHAR(255),
+    calories INT,
+    protein DECIMAL(10,2),
+    fat DECIMAL(10,2),
+    carbs DECIMAL(10,2),
+    fiber DECIMAL(10,2),
+    eaten_at DATETIME,
+    source VARCHAR(255),
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- dimension_weights
+
+CREATE TABLE IF NOT EXISTS dimension_weights (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    target_type VARCHAR(255),
+    target_id BIGINT,
+    dimension VARCHAR(255),
+    weight INT,
+    enabled TINYINT(1),
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- emotion_alert
+
+CREATE TABLE IF NOT EXISTS emotion_alert (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT,
+    alert_type VARCHAR(255),
+    severity VARCHAR(255),
+    title VARCHAR(255),
+    message VARCHAR(255),
+    related_checkin_id BIGINT,
+    resolved TINYINT(1),
+    created_at DATETIME,
+    resolved_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- energy_dimension_config
+
+CREATE TABLE IF NOT EXISTS energy_dimension_config (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    dimension VARCHAR(255),
+    data_source VARCHAR(255),
+    category VARCHAR(255),
+    weight INT,
+    is_active INT,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- exercise_record
+
+CREATE TABLE IF NOT EXISTS exercise_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT,
+    checkin_id BIGINT,
+    exercise_type VARCHAR(255),
+    duration_minutes INT,
+    intensity VARCHAR(255),
+    calories_burned INT,
+    heart_rate_avg INT,
+    heart_rate_max INT,
+    start_time DATETIME,
+    end_time DATETIME,
+    remark VARCHAR(255),
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- family_memberships
+
+CREATE TABLE IF NOT EXISTS family_memberships (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT,
+    level_code VARCHAR(255),
+    start_date DATETIME,
+    end_date DATETIME,
+    payment_method VARCHAR(255),
+    payment_status VARCHAR(255),
+    order_no VARCHAR(255),
+    transaction_id VARCHAR(255),
+    amount INT,
+    auto_renew INT,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- food_recommend_idx
+
+CREATE TABLE IF NOT EXISTS food_recommend_idx (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT,
+    food_id BIGINT,
+    food_name VARCHAR(255),
+    index_score INT,
+    health_report_id BIGINT,
+    calculated_at DATETIME,
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- food_recommend_idx_log
+
+CREATE TABLE IF NOT EXISTS food_recommend_idx_log (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT,
+    food_id BIGINT,
+    food_name VARCHAR(255),
+    previous_index INT,
+    new_index INT,
+    health_report_id BIGINT,
+    change_reason VARCHAR(255),
+    changed_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- guide_activities
+
+CREATE TABLE IF NOT EXISTS guide_activities (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    guide_id BIGINT,
+    title VARCHAR(255),
+    description VARCHAR(255),
+    cover_image VARCHAR(255),
+    category VARCHAR(255),
+    location VARCHAR(255),
+    activity_date DATETIME,
+    max_participants INT,
+    current_participants INT,
+    price BIGINT,
+    status VARCHAR(255),
+    source VARCHAR(255),
+    published_at DATETIME,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- guide_family_relations
+
+CREATE TABLE IF NOT EXISTS guide_family_relations (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    guide_id BIGINT,
+    family_id BIGINT,
+    relation_type VARCHAR(255),
+    status VARCHAR(255),
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- guide_hierarchy
+
+CREATE TABLE IF NOT EXISTS guide_hierarchy (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    parent_id BIGINT,
+    child_id BIGINT,
+    level INT,
+    status VARCHAR(255),
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- health_data_sources
+
+CREATE TABLE IF NOT EXISTS health_data_sources (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT,
+    source_type VARCHAR(255),
+    dimension_codes VARCHAR(255),
+    parsed_result VARCHAR(255),
+    file_url VARCHAR(255),
+    confidence DECIMAL(10,2),
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- health_dimension_scores
+
+CREATE TABLE IF NOT EXISTS health_dimension_scores (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT,
+    dimension VARCHAR(255),
+    score INT,
+    percentile INT,
+    data_source VARCHAR(255),
+    tier INT,
+    raw_data VARCHAR(255),
+    assess_date DATETIME,
+    expire_date DATETIME,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- health_growth_record
+
+CREATE TABLE IF NOT EXISTS health_growth_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT,
+    record_date DATETIME,
+    height_cm DECIMAL(10,2),
+    weight_kg DECIMAL(10,2),
+    bmi DECIMAL(10,2),
+    head_circumference DECIMAL(10,2),
+    bone_age INT,
+    tooth_age INT,
+    growth_rate DECIMAL(10,2),
+    percentile_height INT,
+    percentile_weight INT,
+    percentile_bmi INT,
+    standard_type VARCHAR(255),
+    source VARCHAR(255),
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- health_norm_reference
+
+CREATE TABLE IF NOT EXISTS health_norm_reference (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    dimension VARCHAR(255),
+    gender VARCHAR(255),
+    age_min INT,
+    age_max INT,
+    percentile5 INT,
+    percentile15 INT,
+    percentile25 INT,
+    percentile50 INT,
+    percentile75 INT,
+    percentile85 INT,
+    percentile95 INT,
+    source VARCHAR(255),
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- interaction_logs
+
+CREATE TABLE IF NOT EXISTS interaction_logs (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id BIGINT,
+    from_member_id BIGINT,
+    to_member_id BIGINT,
+    interaction_type VARCHAR(255),
+    description VARCHAR(255),
+    happened_at DATETIME,
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- membership_levels
+
+CREATE TABLE IF NOT EXISTS membership_levels (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    level_code VARCHAR(255),
+    level_name VARCHAR(255),
+    level_desc VARCHAR(255),
+    price_monthly INT,
+    price_quarterly INT,
+    price_yearly INT,
+    features VARCHAR(255),
+    max_children INT,
+    max_tasks_per_day INT,
+    ai_review_enabled INT,
+    priority_support INT,
+    teacher_consultation INT,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- mental_health_screen
+
+CREATE TABLE IF NOT EXISTS mental_health_screen (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    child_id BIGINT,
+    screen_type VARCHAR(255),
+    answers VARCHAR(255),
+    total_score INT,
+    severity_level VARCHAR(255),
+    risk_flags VARCHAR(255),
+    suggestions VARCHAR(255),
+    completed_at DATETIME,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- order_items
+
+CREATE TABLE IF NOT EXISTS order_items (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    order_id BIGINT,
+    product_id BIGINT,
+    sku_id BIGINT,
+    product_name VARCHAR(255),
+    product_image VARCHAR(255),
+    sku_specs VARCHAR(255),
+    price DECIMAL(10,2),
+    quantity INT,
+    subtotal DECIMAL(10,2)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- payment_orders
+
+CREATE TABLE IF NOT EXISTS payment_orders (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    order_no VARCHAR(255),
+    family_id BIGINT,
+    level_code VARCHAR(255),
+    payment_type VARCHAR(255),
+    period VARCHAR(255),
+    amount INT,
+    user_coupon_id BIGINT,
+    status VARCHAR(255),
+    pay_method VARCHAR(255),
+    transaction_id VARCHAR(255),
+    paid_at DATETIME,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- points_exchange_products
+
+CREATE TABLE IF NOT EXISTS points_exchange_products (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(255),
+    description VARCHAR(255),
+    cover_image VARCHAR(255),
+    points_price INT,
+    stock INT,
+    product_type VARCHAR(255),
+    category VARCHAR(255),
+    expiry_days INT,
+    sort_order INT,
+    status VARCHAR(255),
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- points_exchange_records
+
+CREATE TABLE IF NOT EXISTS points_exchange_records (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT,
+    child_id BIGINT,
+    family_member_id BIGINT,
+    product_id BIGINT,
+    product_name VARCHAR(255),
+    points_cost INT,
+    quantity INT,
+    status VARCHAR(255),
+    redeem_code VARCHAR(255),
+    expired_at DATETIME,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- promotion_materials
+
+CREATE TABLE IF NOT EXISTS promotion_materials (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    title VARCHAR(255),
+    description VARCHAR(255),
+    material_type VARCHAR(255),
+    cover_url VARCHAR(255),
+    file_url VARCHAR(255),
+    tags VARCHAR(255),
+    usage_scenario VARCHAR(255),
+    sort_order INT,
+    status VARCHAR(255),
+    created_by BIGINT,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- relationship_questionnaire_responses
+
+CREATE TABLE IF NOT EXISTS relationship_questionnaire_responses (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    snapshot_id BIGINT,
+    respondent_id BIGINT,
+    answers_json VARCHAR(255),
+    trust_score DECIMAL(10,2),
+    intimacy_score DECIMAL(10,2),
+    communication_score DECIMAL(10,2),
+    interaction_bonus DECIMAL(10,2),
+    total_score DECIMAL(10,2),
+    calculated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- relationship_questionnaire_snapshots
+
+CREATE TABLE IF NOT EXISTS relationship_questionnaire_snapshots (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_member_id BIGINT,
+    respondent_id BIGINT,
+    member_name VARCHAR(255),
+    relationship_type VARCHAR(255),
+    ai_generated_json VARCHAR(255),
+    version VARCHAR(255),
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- share_events
+
+CREATE TABLE IF NOT EXISTS share_events (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT,
+    target_type VARCHAR(255),
+    target_id BIGINT,
+    share_channel VARCHAR(255),
+    share_title VARCHAR(255),
+    share_url VARCHAR(255),
+    click_count INT,
+    read_count INT,
+    reward_points INT,
+    status VARCHAR(255),
+    expires_at DATETIME,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- share_reads
+
+CREATE TABLE IF NOT EXISTS share_reads (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    share_event_id BIGINT,
+    reader_id BIGINT,
+    reader_ip VARCHAR(255),
+    read_duration INT,
+    read_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- sleep_record
+
+CREATE TABLE IF NOT EXISTS sleep_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT,
+    checkin_id BIGINT,
+    sleep_time DATETIME,
+    wake_time DATETIME,
+    duration_minutes INT,
+    deep_sleep_minutes INT,
+    light_sleep_minutes INT,
+    rem_minutes INT,
+    quality_score INT,
+    dream_count INT,
+    remark VARCHAR(255),
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- teachers
+
+CREATE TABLE IF NOT EXISTS teachers (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT,
+    teacher_no VARCHAR(255),
+    title VARCHAR(255),
+    specialty VARCHAR(255),
+    bio VARCHAR(255),
+    experience_years INT,
+    rating INT,
+    total_appointments INT,
+    status VARCHAR(255),
+    verification_status VARCHAR(255),
+    street_id BIGINT,
+    province VARCHAR(255),
+    city VARCHAR(255),
+    district VARCHAR(255),
+    street VARCHAR(255),
+    verified_at DATETIME,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- training_plan_items
+
+CREATE TABLE IF NOT EXISTS training_plan_items (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    plan_id BIGINT,
+    sequence INT,
+    dimension_key VARCHAR(255),
+    suggestion VARCHAR(255),
+    task_title VARCHAR(255),
+    task_desc VARCHAR(255),
+    minigame_code VARCHAR(255),
+    article_id BIGINT,
+    task_points INT,
+    deadline_days INT,
+    status VARCHAR(255),
+    completed_at DATETIME,
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- training_plans
+
+CREATE TABLE IF NOT EXISTS training_plans (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    guide_id BIGINT,
+    child_id BIGINT,
+    title VARCHAR(255),
+    description VARCHAR(255),
+    status VARCHAR(255),
+    source VARCHAR(255),
+    deployed_at DATETIME,
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- training_plan_tasks
+
+CREATE TABLE IF NOT EXISTS training_plan_tasks (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    plan_id BIGINT,
+    plan_item_id BIGINT,
+    task_id BIGINT,
+    child_id BIGINT,
+    status VARCHAR(255),
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- upgrade_services
+
+CREATE TABLE IF NOT EXISTS upgrade_services (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    guide_id BIGINT,
+    from_level VARCHAR(255),
+    to_level VARCHAR(255),
+    service_fee INT,
+    status VARCHAR(255),
+    reviewed_by BIGINT,
+    reviewed_at DATETIME,
+    reject_reason VARCHAR(255),
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- user_nutrition_profile
+
+CREATE TABLE IF NOT EXISTS user_nutrition_profile (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT,
+    fruit_allergy VARCHAR(255),
+    fruit_preferences VARCHAR(255),
+    questionnaire_status VARCHAR(255),
+    budget_monthly INT,
+    family_taste_preferences VARCHAR(255),
+    cuisine_style VARCHAR(255),
+    meal_count INT,
+    cooking_ability VARCHAR(255),
+    created_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- user_rfm_tags
+
+CREATE TABLE IF NOT EXISTS user_rfm_tags (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    user_id BIGINT,
+    r_score INT,
+    f_score INT,
+    m_score INT,
+    rfm_tier VARCHAR(255),
+    total_orders INT,
+    total_amount DECIMAL(10,2),
+    last_order_at DATETIME,
+    updated_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- user_trigger_rules
+
+CREATE TABLE IF NOT EXISTS user_trigger_rules (
+    user_id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    action_config VARCHAR(255),
+    last_triggered_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- water_record
+
+CREATE TABLE IF NOT EXISTS water_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT,
+    checkin_id BIGINT,
+    amount_ml INT,
+    water_type VARCHAR(255),
+    drunk_at DATETIME,
+    created_at DATETIME
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- =============================================
+-- 家庭成员变更日志表
+-- =============================================
+
+CREATE TABLE IF NOT EXISTS family_member_logs (
+    id           BIGINT AUTO_INCREMENT PRIMARY KEY,
+    family_id    BIGINT       NOT NULL COMMENT '家庭ID',
+    member_id    BIGINT       NOT NULL COMMENT '成员ID',
+    action       VARCHAR(32)  NOT NULL COMMENT '操作: join/leave/update/kick',
+    old_value    VARCHAR(500) COMMENT '旧值',
+    new_value    VARCHAR(500) COMMENT '新值',
+    operator_id  BIGINT       COMMENT '操作人用户ID',
+    created_at   DATETIME     DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_family_id (family_id),
+    INDEX idx_member_id (member_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='家庭成员变更日志';
+
+-- 健康打卡 - 运动记录
+CREATE TABLE IF NOT EXISTS exercise_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT NOT NULL COMMENT '家庭成员ID',
+    checkin_id BIGINT COMMENT '关联打卡ID',
+    exercise_type VARCHAR(32) COMMENT '运动类型: run/swim/yoga/walk/cycle/other',
+    duration_minutes INT COMMENT '时长(分钟)',
+    intensity VARCHAR(16) COMMENT '强度: low/medium/high',
+    calories_burned INT COMMENT '消耗热量(千卡)',
+    heart_rate_avg INT COMMENT '平均心率',
+    heart_rate_max INT COMMENT '最大心率',
+    start_time DATETIME COMMENT '开始时间',
+    end_time DATETIME COMMENT '结束时间',
+    remark TEXT COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_member_id (member_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='运动打卡记录';
+
+-- 健康打卡 - 睡眠记录
+CREATE TABLE IF NOT EXISTS sleep_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT NOT NULL COMMENT '家庭成员ID',
+    checkin_id BIGINT COMMENT '关联打卡ID',
+    sleep_time DATETIME COMMENT '入睡时间',
+    wake_time DATETIME COMMENT '醒来时间',
+    duration_minutes INT COMMENT '总睡眠时长(分钟)',
+    deep_sleep_minutes INT COMMENT '深睡时长(分钟)',
+    light_sleep_minutes INT COMMENT '浅睡时长(分钟)',
+    rem_minutes INT COMMENT 'REM时长(分钟)',
+    quality_score INT COMMENT '睡眠质量评分1-10',
+    dream_count INT COMMENT '做梦次数',
+    remark TEXT COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_member_id (member_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='睡眠打卡记录';
+
+-- 健康打卡 - 饮水记录
+CREATE TABLE IF NOT EXISTS water_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT NOT NULL COMMENT '家庭成员ID',
+    checkin_id BIGINT COMMENT '关联打卡ID',
+    amount_ml INT COMMENT '饮水量(毫升)',
+    water_type VARCHAR(32) COMMENT '类型: plain/sparkling/tea/other',
+    drunk_at DATETIME COMMENT '饮水时间',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_member_id (member_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='饮水打卡记录';
+
+-- 健康打卡 - 饮食记录
+CREATE TABLE IF NOT EXISTS health_meal_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT NOT NULL COMMENT '家庭成员ID',
+    checkin_id BIGINT COMMENT '关联打卡ID',
+    meal_type VARCHAR(32) COMMENT '餐次: breakfast/lunch/dinner/snack',
+    food_items TEXT COMMENT '食物清单JSON',
+    total_calories INT COMMENT '总卡路里',
+    protein_g INT COMMENT '蛋白质克数',
+    fat_g INT COMMENT '脂肪克数',
+    carbs_g INT COMMENT '碳水克数',
+    fiber_g INT COMMENT '膳食纤维克数',
+    meal_time DATETIME COMMENT '用餐时间',
+    remark VARCHAR(500) COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_member_id (member_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='饮食打卡记录';
+
+-- 健康打卡 - 冥想记录
+CREATE TABLE IF NOT EXISTS health_meditation_record (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    member_id BIGINT NOT NULL COMMENT '家庭成员ID',
+    checkin_id BIGINT COMMENT '关联打卡ID',
+    duration_minutes INT COMMENT '时长(分钟)',
+    type VARCHAR(32) COMMENT '类型: mindfulness/guided/breathing/body_scan',
+    mood VARCHAR(32) COMMENT '冥想后心情',
+    remark VARCHAR(500) COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_member_id (member_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='冥想打卡记录';
+
+-- 电商供应商
+CREATE TABLE IF NOT EXISTS ecom_supplier (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(100) NOT NULL COMMENT '供应商名称',
+    contact_name VARCHAR(50) COMMENT '联系人',
+    contact_phone VARCHAR(20) COMMENT '联系电话',
+    status TINYINT DEFAULT 1 COMMENT '启用状态 1启用 0禁用',
+    remark VARCHAR(500) COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='电商供应商';
+
+-- 佣金返利配置
+CREATE TABLE IF NOT EXISTS rebate_commission_config (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(100) NOT NULL COMMENT '配置名称',
+    rate INT COMMENT '佣金比例(万分比)',
+    rate_type TINYINT DEFAULT 1 COMMENT '比例类型 1百分比 2固定金额',
+    min_amount INT COMMENT '最低金额(分)',
+    max_amount INT COMMENT '最高金额(分)',
+    remark VARCHAR(500) COMMENT '备注',
+    created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
+    updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='佣金返利配置';

+ 200 - 0
cfc-frontend/components/ContactCard.vue

@@ -18,6 +18,34 @@
     <text class="card-birthday" v-if="contact.birthdayCountdown">
       🎂 {{ contact.birthdayLabel }} · {{ contact.birthdayCountdown }}
     </text>
+    <view class="card-family-status" v-if="contact.familyMemberId">
+      <text class="family-badge">已是家庭成员</text>
+    </view>
+    <view class="card-invite" v-else @click.stop="handleInvite">
+      <text class="invite-text">邀请加入家庭</text>
+    </view>
+  </view>
+  <view class="invite-modal" v-if="showInviteModal" @click.stop>
+    <view class="modal-mask" @click="showInviteModal = false"></view>
+    <view class="modal-content">
+      <text class="modal-title">邀请加入家庭</text>
+      <view class="form-row">
+        <text class="form-label">关系类型</text>
+        <picker :range="relationshipTypeList" range-key="typeName" @change="onRelationshipChange">
+          <text class="form-value">{{ selectedRelationshipName || '请选择' }}</text>
+        </picker>
+      </view>
+      <view class="form-row">
+        <text class="form-label">辈分等级</text>
+        <picker :range="generationLevelList" @change="onGenerationChange">
+          <text class="form-value">{{ selectedGeneration || '请选择' }}</text>
+        </picker>
+      </view>
+      <view class="modal-buttons">
+        <view class="modal-btn cancel" @click="showInviteModal = false">取消</view>
+        <view class="modal-btn confirm" @click="confirmInvite">确认邀请</view>
+      </view>
+    </view>
   </view>
 </template>
 
@@ -26,6 +54,15 @@ export default {
   props: {
     contact: { type: Object, required: true }
   },
+  data: function() {
+    return {
+      showInviteModal: false,
+      relationshipTypeList: [],
+      selectedRelationshipName: '',
+      generationLevelList: ['父母(+1)', '子女(-1)', '配偶(0)', '兄弟姐妹(0)', '祖父母(+2)', '孙子女(-2)'],
+      selectedGeneration: ''
+    }
+  },
   computed: {
     initial: function() {
       return this.contact.name ? this.contact.name[0] : '?'
@@ -49,6 +86,80 @@ export default {
       var known = new Date(this.contact.knownSince)
       return Math.floor((now - known) / (365.25 * 86400000))
     }
+  },
+  methods: {
+    handleInvite: function() {
+      this.showInviteModal = true
+      this.loadRelationshipTypes()
+    },
+    loadRelationshipTypes: function() {
+      var that = this
+      var app = getApp()
+      if (!app || !app.globalData || !app.globalData.baseUrl) return
+      uni.request({
+        url: app.globalData.baseUrl + '/api/family/member/relationship-types',
+        method: 'POST',
+        header: { 'Authorization': 'Bearer ' + uni.getStorageSync('token') },
+        success: function(res) {
+          if (res.data && res.data.data) {
+            that.relationshipTypeList = res.data.data
+          }
+        }
+      })
+    },
+    onRelationshipChange: function(e) {
+      var idx = e.detail.value
+      var item = this.relationshipTypeList[idx]
+      if (item) {
+        this.selectedRelationshipName = item.typeName
+      }
+    },
+    onGenerationChange: function(e) {
+      this.selectedGeneration = this.generationLevelList[e.detail.value]
+    },
+    confirmInvite: function() {
+      if (!this.selectedRelationshipName) {
+        uni.showToast({ title: '请选择关系类型', icon: 'none' })
+        return
+      }
+      var that = this
+      var generationMap = {
+        '父母(+1)': 'parent',
+        '子女(-1)': 'child',
+        '配偶(0)': 'spouse',
+        '兄弟姐妹(0)': 'sibling',
+        '祖父母(+2)': 'grandparent',
+        '孙子女(-2)': 'grandchild'
+      }
+      var generationLevel = generationMap[this.selectedGeneration] || 'child'
+      var selectedItem = this.relationshipTypeList.filter(function(item) {
+        return item.typeName === that.selectedRelationshipName
+      })[0]
+      var app = getApp()
+      if (!app || !app.globalData || !app.globalData.baseUrl) return
+      uni.request({
+        url: app.globalData.baseUrl + '/api/contact/invite-to-family',
+        method: 'POST',
+        header: { 'Authorization': 'Bearer ' + uni.getStorageSync('token') },
+        data: {
+          contactId: this.contact.id,
+          relationshipType: selectedItem ? selectedItem.typeKey : 'child',
+          generationLevel: generationLevel
+        },
+        success: function(res) {
+          if (res.data && res.data.code === 200) {
+            uni.showToast({ title: '邀请成功', icon: 'success' })
+            that.showInviteModal = false
+            that.$emit('invited', that.contact.id)
+          } else {
+            uni.showToast({ title: res.data && res.data.message || '邀请失败', icon: 'none' })
+          }
+        },
+        fail: function() {
+          uni.showToast({ title: '网络错误', icon: 'none' })
+        }
+      })
+    }
   }
 }
 </script>
@@ -110,4 +221,93 @@ export default {
   font-size: 20rpx;
   color: #EC4899;
 }
+.card-family-status {
+  margin-top: 8rpx;
+}
+.family-badge {
+  font-size: 20rpx;
+  color: #10B981;
+  background: rgba(16, 185, 129, 0.12);
+  padding: 2rpx 12rpx;
+  border-radius: 8rpx;
+}
+.card-invite {
+  margin-top: 8rpx;
+  padding: 4rpx 16rpx;
+  background: #F97316;
+  border-radius: 10rpx;
+}
+.invite-text {
+  font-size: 20rpx;
+  color: #fff;
+}
+.invite-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.modal-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0,0,0,0.5);
+}
+.modal-content {
+  position: relative;
+  width: 600rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 40rpx;
+}
+.modal-title {
+  font-size: 32rpx;
+  font-weight: bold;
+  color: #333;
+  text-align: center;
+  margin-bottom: 30rpx;
+}
+.form-row {
+  margin-bottom: 20rpx;
+}
+.form-label {
+  font-size: 26rpx;
+  color: #666;
+  margin-bottom: 8rpx;
+}
+.form-value {
+  font-size: 28rpx;
+  color: #333;
+  padding: 12rpx 16rpx;
+  background: #f5f5f5;
+  border-radius: 8rpx;
+}
+.modal-buttons {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 30rpx;
+}
+.modal-btn {
+  flex: 1;
+  text-align: center;
+  padding: 16rpx 0;
+  border-radius: 10rpx;
+  font-size: 28rpx;
+}
+.modal-btn.cancel {
+  background: #f5f5f5;
+  color: #666;
+  margin-right: 16rpx;
+}
+.modal-btn.confirm {
+  background: #F97316;
+  color: #fff;
+}
 </style>

+ 167 - 157
cfc-frontend/components/FamilyRelationGraph.vue

@@ -1,10 +1,6 @@
 <template>
   <!-- 全 Canvas 关系图谱 - Force-directed 物理布局 -->
   <view class="family-graph-wrapper" v-if="simNodes && simNodes.length >= 1">
-    <!-- 右上角小齿轮 -->
-    <view class="gear-icon" @click="onManageTap">
-      <text class="gear-text">⚙</text>
-    </view>
     <canvas
       class="family-graph-canvas"
       canvas-id="forceGraphCanvas"
@@ -13,19 +9,7 @@
       :style="{ width: canvasWidth + 'px', height: canvasHeight + 'px' }"
       @touchstart="onTouchStart"
       @touchmove="onTouchMove"
-      @touchend="onTouchEnd"
-      @click="onCanvasClick" />
-    <!-- PC 端悬停检测层 -->
-    <view
-      v-if="isPC"
-      class="hover-layer"
-      :style="{ width: canvasWidth + 'px', height: canvasHeight + 'px' }"
-      @mousemove="onHoverMove"
-      @mouseleave="onHoverLeave" />
-    <!-- + 添加成员提示(触摸/悬停时显示在中心节点旁) -->
-    <view class="add-hint" :class="{ 'add-hint-visible': touchingSelf || hoveringSelf }" :style="addHintPosition">
-      <text class="add-hint-text">+</text>
-    </view>
+      @touchend="onTouchEnd" />
   </view>
   <!-- 空状态 -->
   <view class="family-graph-empty" v-else-if="members && members.length === 0">
@@ -105,15 +89,6 @@ export default {
       dragging: null,
       dragStartPos: null,
 
-      // 当前用户触摸状态(显示+号)
-      touchingSelf: false,
-
-      // PC 端鼠标悬停状态(显示 + 号)
-      hoveringSelf: false,
-
-      // 是否 PC 环境(h5 编译)
-      isPC: false,
-
       // 动画
       animFrameId: null,
       isSimulating: false,
@@ -133,16 +108,6 @@ export default {
       return this.themeColors[this.dimensionCode] || '#8D6E63'
     },
 
-    // + 提示位置(跟随中心节点偏移)
-    addHintPosition: function() {
-      var selfNode = this.simNodes.find(function(n) { return n.isSelf })
-      if (!selfNode) return {}
-      return {
-        left: (selfNode.x + selfNode.radius * 0.7) + 'px',
-        top: (selfNode.y - selfNode.radius * 0.5) + 'px'
-      }
-    },
-
     // 将 members 转换为 simNodes
     nodeData: function() {
       var self = this
@@ -160,7 +125,7 @@ export default {
         if (nick === '用户') nick = '成员'
 
         var isSelf = (fid == self.selfId)
-        var displayName = isSelf ? '我' : nick.charAt(0)
+        var displayName = nick.charAt(0)
 
         // 圆形布局初始位置
         var angle = (2 * Math.PI * idx) / Math.max(1, self.members.length)
@@ -174,6 +139,7 @@ export default {
           displayName: displayName,
           isSelf: isSelf,
           memberType: m.memberType || 'child',
+          relationshipType: m.relationshipType || '',
           radius: radius,
           x: initX,
           y: initY,
@@ -216,12 +182,8 @@ export default {
     }
   },
   watch: {
-    members: {
-      handler: function() {
-        this.adjustHeight()
-        this.resetSimulation()
-      },
-      deep: true
+    members: function() {
+      this.resetSimulation()
     },
     canvasWidth: function() {
       this.resetSimulation()
@@ -233,11 +195,8 @@ export default {
   mounted: function() {
     var self = this
     this.dpr = uni.getSystemInfoSync().pixelRatio || 1
-    // 检测是否 PC 端 h5 编译(微信小程序无 mouse 事件,走触摸路径即可)
-    this.isPC = typeof window !== 'undefined' && typeof document !== 'undefined'
 
     this.$nextTick(function() {
-      self.adjustHeight()
       self.updateCanvasSize()
       self.$nextTick(function() {
         self.initSimulation()
@@ -284,7 +243,7 @@ export default {
     stopSimulation: function() {
       this.isSimulating = false
       if (this.animFrameId) {
-        clearTimeout(this.animFrameId)
+        cancelAnimationFrame(this.animFrameId)
         this.animFrameId = null
       }
     },
@@ -296,32 +255,15 @@ export default {
       var nodes = this.simNodes
       var p = this.physics
 
-      // 中心坐标(提前定义,供多处使用)
-      var cx = this.canvasWidth / 2
-      var cy = this.canvasHeight / 2
-
       // 1. 清零力
       for (var i = 0; i < nodes.length; i++) {
-        var n = nodes[i]
-        if (n.isSelf) {
-          // 当前用户固定在中心
-          n.x = cx
-          n.y = cy
-          n.vx = 0
-          n.vy = 0
-          n.fx = 0
-          n.fy = 0
-          continue
-        }
-        n.fx = 0
-        n.fy = 0
+        nodes[i].fx = 0
+        nodes[i].fy = 0
       }
 
-      // 2. 斥力(当前用户除外)
+      // 2. 斥力
       for (var a = 0; a < nodes.length; a++) {
-        if (nodes[a].isSelf) continue
         for (var b = a + 1; b < nodes.length; b++) {
-          if (nodes[b].isSelf) continue
           var dx = nodes[b].x - nodes[a].x
           var dy = nodes[b].y - nodes[a].y
           var distSq = dx * dx + dy * dy
@@ -336,12 +278,11 @@ export default {
         }
       }
 
-      // 3. 弹簧引力(当前用户连接到其他成员,但当前用户固定不动)
+      // 3. 弹簧引力
       for (var e = 0; e < this.edges.length; e++) {
         var edge = this.edges[e]
         var s = edge.source
         var t = edge.target
-        // 目标节点受力弹簧牵引,源节点(自己)保持固定
         var dx = t.x - s.x
         var dy = t.y - s.y
         var dist = Math.sqrt(dx * dx + dy * dy) || 0.1
@@ -349,22 +290,23 @@ export default {
         var force = p.springStrength * displacement
         var fx = (dx / dist) * force
         var fy = (dy / dist) * force
-        // 只让目标节点受力(其他成员被弹簧拉向自己)
+        s.fx += fx
+        s.fy += fy
         t.fx -= fx
         t.fy -= fy
       }
 
-      // 4. 中心引力(当前用户除外)
+      // 4. 中心引力
+      var cx = this.canvasWidth / 2
+      var cy = this.canvasHeight / 2
       for (var n = 0; n < nodes.length; n++) {
-        if (nodes[n].isSelf) continue
         nodes[n].fx += (cx - nodes[n].x) * p.centering
         nodes[n].fy += (cy - nodes[n].y) * p.centering
       }
 
-      // 5. 更新速度 + 位置(当前用户除外)
+      // 5. 更新速度 + 位置
       for (var i = 0; i < nodes.length; i++) {
         var node = nodes[i]
-        if (node.isSelf) continue
         node.vx += node.fx
         node.vy += node.fy
         node.vx *= p.damping
@@ -387,10 +329,10 @@ export default {
       // 6. 渲染
       this.render()
 
-      // 7. 下一帧 (小程序无 requestAnimationFrame,用 setTimeout 模拟 60fps)
-      this.animFrameId = setTimeout(function() {
+      // 7. 下一帧
+      this.animFrameId = requestAnimationFrame(function() {
         self.simulationTick()
-      }, 16)
+      })
     },
 
     // ===== 渲染 =====
@@ -439,18 +381,45 @@ export default {
       for (var i = 0; i < nodes.length; i++) {
         var node = nodes[i]
         var r = node.radius
-        ctx.beginPath()
-        ctx.arc(node.x, node.y, r, 0, 2 * Math.PI)
+
         if (node.isSelf) {
+          // 自我:双层圆环
+          ctx.beginPath()
+          ctx.arc(node.x, node.y, r, 0, 2 * Math.PI)
           ctx.fillStyle = '#FFFFFF'
           ctx.fill()
           ctx.strokeStyle = this.themeColor
           ctx.lineWidth = 3
           ctx.stroke()
+          // 内环
+          ctx.beginPath()
+          ctx.arc(node.x, node.y, r * 0.7, 0, 2 * Math.PI)
+          ctx.strokeStyle = this.themeColor + '88'
+          ctx.lineWidth = 2
+          ctx.stroke()
+        } else if (node.relationshipType === 'spouse') {
+          // 配偶:心形
+          this.drawHeart(ctx, node.x, node.y, r)
+          ctx.fillStyle = this.themeColor + '22'
+          ctx.fill()
+        } else if (node.relationshipType === 'parent') {
+          // 父母:圆角方形
+          this.drawRoundedRect(ctx, node.x, node.y, r * 2, r * 2, r * 0.3)
+          ctx.fillStyle = this.themeColor + '22'
+          ctx.fill()
+        } else if (node.relationshipType === 'sibling') {
+          // 兄弟姐妹:八边形
+          this.drawPolygon(ctx, node.x, node.y, r, 8)
+          ctx.fillStyle = this.themeColor + '22'
+          ctx.fill()
         } else {
+          // 孩子/默认:圆形
+          ctx.beginPath()
+          ctx.arc(node.x, node.y, r, 0, 2 * Math.PI)
           ctx.fillStyle = this.themeColor + '22'
           ctx.fill()
         }
+
         ctx.fillStyle = node.isSelf ? this.themeColor : '#4A5568'
         ctx.font = 'bold ' + (r * 0.9) + 'px sans-serif'
         ctx.textAlign = 'center'
@@ -472,8 +441,8 @@ export default {
         var trust = edge.trust || 75
         var comm = edge.communication || 50
         var hue = 120 * trust / 100
-        ctx.strokeStyle = 'hsla(' + hue + ', 75%, 45%, 0.6)'
-        ctx.lineWidth = 1 + (comm / 100) * 4
+        ctx.setStrokeStyle('hsla(' + hue + ', 75%, 45%, 0.6)')
+        ctx.setLineWidth(1 + (comm / 100) * 4)
         ctx.beginPath()
         ctx.moveTo(edge.source.x, edge.source.y)
         ctx.lineTo(edge.target.x, edge.target.y)
@@ -483,25 +452,47 @@ export default {
       for (var j = 0; j < nodes.length; j++) {
         var node = nodes[j]
         var r = node.radius
-        ctx.beginPath()
-        ctx.arc(node.x, node.y, r, 0, 2 * Math.PI)
+
         if (node.isSelf) {
+          ctx.beginPath()
+          ctx.arc(node.x, node.y, r, 0, 2 * Math.PI)
           ctx.setFillStyle('#FFFFFF')
           ctx.fill()
           ctx.setStrokeStyle(this.themeColor)
           ctx.setLineWidth(3)
           ctx.stroke()
+          // inner ring
+          ctx.beginPath()
+          ctx.arc(node.x, node.y, r * 0.7, 0, 2 * Math.PI)
+          ctx.setStrokeStyle(this.themeColor + '88')
+          ctx.setLineWidth(2)
+          ctx.stroke()
+        } else if (node.relationshipType === 'spouse') {
+          this.drawHeartLegacy(ctx, node.x, node.y, r)
+          ctx.setFillStyle(this.themeColor + '22')
+          ctx.fill()
+        } else if (node.relationshipType === 'parent') {
+          this.drawRoundedRectLegacy(ctx, node.x, node.y, r * 2, r * 2, r * 0.3)
+          ctx.setFillStyle(this.themeColor + '22')
+          ctx.fill()
+        } else if (node.relationshipType === 'sibling') {
+          this.drawPolygonLegacy(ctx, node.x, node.y, r, 8)
+          ctx.setFillStyle(this.themeColor + '22')
+          ctx.fill()
         } else {
+          ctx.beginPath()
+          ctx.arc(node.x, node.y, r, 0, 2 * Math.PI)
           ctx.setFillStyle(this.themeColor + '22')
-ctx.fill()
+          ctx.fill()
         }
-        ctx.fillStyle = node.isSelf ? this.themeColor : '#4A5568'
-        ctx.font = 'bold ' + (r * 0.9) + 'px sans-serif'
-        ctx.textAlign = 'center'
-        ctx.textBaseline = 'middle'
+
+        ctx.setFillStyle(node.isSelf ? this.themeColor : '#4A5568')
+        ctx.setFont('bold ' + (r * 0.9) + 'px sans-serif')
+        ctx.setTextAlign('center')
+        ctx.setTextBaseline('middle')
         ctx.fillText(node.displayName, node.x, node.y)
-        ctx.fillStyle = node.isSelf ? this.themeColor : '#94A3B8'
-        ctx.font = (r * 0.4) + 'px sans-serif'
+        ctx.setFillStyle(node.isSelf ? this.themeColor : '#94A3B8')
+        ctx.setFont((r * 0.4) + 'px sans-serif')
         ctx.fillText(node.nickname.substring(0, 3), node.x, node.y + r + 10)
       }
       ctx.draw()
@@ -538,12 +529,8 @@ ctx.fill()
           var y = touch.clientY - rect.top
           var node = self.getTouchNode(x, y)
           if (node) {
-            if (node.isSelf) {
-              self.touchingSelf = true
-            } else {
-              self.dragging = { node: node, offsetX: x - node.x, offsetY: y - node.y }
-              self.dragStartPos = { x: x, y: y }
-            }
+            self.dragging = { node: node, offsetX: x - node.x, offsetY: y - node.y }
+            self.dragStartPos = { x: x, y: y }
           }
         }
       })
@@ -571,17 +558,6 @@ ctx.fill()
     },
 
     onTouchEnd: function(e) {
-      var wasTouchingSelf = this.touchingSelf
-      this.touchingSelf = false
-      if (wasTouchingSelf) {
-        // 触摸的是中心"我"节点 → 添加成员
-        if (this.interactive) {
-          this.$emit('addMemberTap')
-        }
-        this.dragging = null
-        this.dragStartPos = null
-        return
-      }
       if (!this.dragging) return
       var wasDragged = this.dragStartPos && (
         Math.abs(this.dragging.node.x - this.dragStartPos.x) > 5 ||
@@ -630,11 +606,90 @@ ctx.fill()
       }).exec()
     },
 
-    // 点击右上角小齿轮 → 跳转成员管理页
-    onManageTap: function() {
-      uni.navigateTo({
-        url: '/pages/profile/family-members'
-      })
+    // ===== 形状绘制辅助方法 =====
+
+    drawHeart: function(ctx, cx, cy, size) {
+      ctx.beginPath()
+      var topX = cx
+      var topY = cy - size * 0.4
+      ctx.moveTo(topX, topY)
+      // 左曲线
+      ctx.bezierCurveTo(
+        cx - size * 0.9, cy - size * 0.7,
+        cx - size * 0.6, cy + size * 0.5,
+        cx, cy + size * 0.8
+      )
+      // 右曲线
+      ctx.bezierCurveTo(
+        cx + size * 0.6, cy + size * 0.5,
+        cx + size * 0.9, cy - size * 0.7,
+        cx, cy - size * 0.4
+      )
+      ctx.closePath()
+    },
+
+    drawRoundedRect: function(ctx, cx, cy, w, h, r) {
+      ctx.beginPath()
+      var x = cx - w / 2
+      var y = cy - h / 2
+      ctx.moveTo(x + r, y)
+      ctx.arcTo(x + w, y, x + w, y + h, r)
+      ctx.arcTo(x + w, y + h, x, y + h, r)
+      ctx.arcTo(x, y + h, x, y, r)
+      ctx.arcTo(x, y, x + w, y, r)
+      ctx.closePath()
+    },
+
+    drawPolygon: function(ctx, cx, cy, r, sides) {
+      ctx.beginPath()
+      var startAngle = -Math.PI / 2
+      for (var i = 0; i < sides; i++) {
+        var angle = startAngle + (2 * Math.PI * i) / sides
+        var px = cx + r * Math.cos(angle)
+        var py = cy + r * Math.sin(angle)
+        if (i === 0) {
+          ctx.moveTo(px, py)
+        } else {
+          ctx.lineTo(px, py)
+        }
+      }
+      ctx.closePath()
+    },
+
+    drawHeartLegacy: function(ctx, cx, cy, size) {
+      ctx.beginPath()
+      ctx.moveTo(cx, cy - size * 0.4)
+      ctx.bezierCurveTo(cx - size * 0.9, cy - size * 0.7, cx - size * 0.6, cy + size * 0.5, cx, cy + size * 0.8)
+      ctx.bezierCurveTo(cx + size * 0.6, cy + size * 0.5, cx + size * 0.9, cy - size * 0.7, cx, cy - size * 0.4)
+      ctx.closePath()
+    },
+
+    drawRoundedRectLegacy: function(ctx, cx, cy, w, h, r) {
+      ctx.beginPath()
+      var x = cx - w / 2
+      var y = cy - h / 2
+      ctx.moveTo(x + r, y)
+      ctx.arcTo(x + w, y, x + w, y + h, r)
+      ctx.arcTo(x + w, y + h, x, y + h, r)
+      ctx.arcTo(x, y + h, x, y, r)
+      ctx.arcTo(x, y, x + w, y, r)
+      ctx.closePath()
+    },
+
+    drawPolygonLegacy: function(ctx, cx, cy, r, sides) {
+      ctx.beginPath()
+      var startAngle = -Math.PI / 2
+      for (var i = 0; i < sides; i++) {
+        var angle = startAngle + (2 * Math.PI * i) / sides
+        var px = cx + r * Math.cos(angle)
+        var py = cy + r * Math.sin(angle)
+        if (i === 0) {
+          ctx.moveTo(px, py)
+        } else {
+          ctx.lineTo(px, py)
+        }
+      }
+      ctx.closePath()
     }
   }
 }
@@ -656,51 +711,6 @@ ctx.fill()
   left: 0;
   z-index: 1;
 }
-/* 右上角小齿轮 */
-.gear-icon {
-  position: absolute;
-  top: 12rpx;
-  right: 12rpx;
-  z-index: 10;
-  width: 56rpx;
-  height: 56rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: rgba(255, 255, 255, 0.9);
-  border-radius: 50%;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
-}
-.gear-text {
-  font-size: 32rpx;
-  color: #94A3B8;
-}
-/* + 添加成员提示 */
-.add-hint {
-  position: absolute;
-  z-index: 5;
-  width: 40rpx;
-  height: 40rpx;
-  border-radius: 50%;
-  background: #10B981;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  opacity: 0;
-  transform: scale(0.5);
-  transition: opacity 0.15s, transform 0.15s;
-  pointer-events: none;
-}
-.add-hint.add-hint-visible {
-  opacity: 1;
-  transform: scale(1);
-}
-.add-hint-text {
-  font-size: 28rpx;
-  color: #FFFFFF;
-  font-weight: bold;
-  line-height: 1;
-}
 .family-graph-empty {
   display: flex;
   align-items: center;

+ 22 - 0
cfc-frontend/pages.json

@@ -721,6 +721,28 @@
         }
       ]
     },
+    {
+      "root": "pages/nutritionist",
+      "pages": [
+        {
+          "path": "apply",
+          "style": {
+            "navigationBarTitleText": "营养师入驻"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pages/butler",
+      "pages": [
+        {
+          "path": "apply",
+          "style": {
+            "navigationBarTitleText": "管家入驻"
+          }
+        }
+      ]
+    },
     {
       "root": "pages/stats",
       "pages": [

+ 1 - 1
cfc-frontend/pages/activity/create.vue

@@ -254,7 +254,7 @@ export default {
     uploadCover(filePath) {
       var self = this
       uni.uploadFile({
-        url: BASE_URL + '/api/admin/article/upload/image',
+        url: BASE_URL + '/api/admin/articles/upload/image',
         filePath: filePath,
         name: 'file',
         header: { 'Authorization': 'Bearer ' + (uni.getStorageSync('token') || '') },

+ 1 - 1
cfc-frontend/pages/article-center/article-edit.vue

@@ -134,7 +134,7 @@ export default {
           // 上传图片
           var token = uni.getStorageSync('token')
           uni.uploadFile({
-            url: (config.default && config.default.API_BASE_URL) || config.API_BASE_URL || '' + '/api/upload/image',
+            url: (config.default && config.default.API_BASE_URL) || config.API_BASE_URL || '' + '/api/media/upload',
             filePath: tempPath,
             name: 'file',
             header: {

+ 200 - 0
cfc-frontend/pages/butler/apply/index.vue

@@ -0,0 +1,200 @@
+<template>
+  <view class="container">
+    <view class="header">
+      <text class="title">成为管家</text>
+      <text class="subtitle">提交您的管家资质,为更多家庭提供专业服务</text>
+    </view>
+
+    <view class="form">
+      <view class="form-item">
+        <text class="label">真实姓名</text>
+        <input class="input" v-model="formData.realName" placeholder="请输入真实姓名" />
+      </view>
+
+      <view class="form-item">
+        <text class="label">手机号</text>
+        <input class="input" v-model="formData.phone" type="number" placeholder="请输入手机号" maxlength="11" />
+      </view>
+
+      <view class="form-item">
+        <text class="label">管家等级</text>
+        <picker mode="selector" :range="tiers" range-key="label" @change="onTierChange">
+          <view class="picker">
+            <text v-if="formData.tier">{{ getTierLabel(formData.tier) }}</text>
+            <text v-else class="placeholder">请选择管家等级</text>
+            <text class="arrow">›</text>
+          </view>
+        </picker>
+      </view>
+
+      <view class="form-item">
+        <text class="label">资质说明</text>
+        <textarea class="textarea" v-model="formData.description" placeholder="请说明您的管家资质、从业经验等" maxlength="500" />
+        <text class="counter">{{ formData.description.length }}/500</text>
+      </view>
+
+      <button class="btn-submit" :disabled="submitting" @click="handleSubmit">
+        {{ submitting ? '提交中...' : '提交申请' }}
+      </button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { butlerApply } from '../../utils/api'
+
+export default {
+  data() {
+    return {
+      tiers: [
+        { value: 'bronze', label: '青铜管家' },
+        { value: 'silver', label: '白银管家' },
+        { value: 'gold', label: '黄金管家' },
+        { value: 'platinum', label: '铂金管家' }
+      ],
+      formData: {
+        realName: '',
+        phone: '',
+        tier: '',
+        description: ''
+      },
+      submitting: false
+    }
+  },
+  methods: {
+    onTierChange(e) {
+      this.formData.tier = this.tiers[e.detail.value].value
+    },
+    getTierLabel(value) {
+      const item = this.tiers.find(t => t.value === value)
+      return item ? item.label : value
+    },
+    async handleSubmit() {
+      if (!this.formData.realName) {
+        uni.showToast({ title: '请输入真实姓名', icon: 'none' })
+        return
+      }
+      if (!this.formData.phone) {
+        uni.showToast({ title: '请输入手机号', icon: 'none' })
+        return
+      }
+      this.submitting = true
+      try {
+        const res = await butlerApply({
+          tier: this.formData.tier,
+          description: this.formData.description
+        })
+        if (res.code === 200) {
+          uni.showModal({
+            title: '申请成功',
+            content: '您的管家申请已提交,请等待审核',
+            showCancel: false,
+            success: () => uni.navigateBack()
+          })
+        } else {
+          uni.showToast({ title: res.message || '提交失败', icon: 'none' })
+        }
+      } catch (e) {
+        uni.showToast({ title: '提交失败', icon: 'none' })
+      } finally {
+        this.submitting = false
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.container {
+  padding: 30rpx;
+  background: #f8f8f8;
+  min-height: 100vh;
+}
+.header {
+  text-align: center;
+  padding: 40rpx 0;
+}
+.title {
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #333;
+}
+.subtitle {
+  font-size: 28rpx;
+  color: #666;
+  margin-top: 16rpx;
+  display: block;
+}
+.form {
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 40rpx;
+}
+.form-item {
+  margin-bottom: 40rpx;
+}
+.label {
+  font-size: 28rpx;
+  color: #333;
+  display: block;
+  margin-bottom: 20rpx;
+  font-weight: bold;
+}
+.input {
+  width: 100%;
+  height: 80rpx;
+  border: 1rpx solid #e0e0e0;
+  border-radius: 10rpx;
+  padding: 0 20rpx;
+  font-size: 28rpx;
+  box-sizing: border-box;
+}
+.picker {
+  width: 100%;
+  height: 80rpx;
+  border: 1rpx solid #e0e0e0;
+  border-radius: 10rpx;
+  padding: 0 20rpx;
+  font-size: 28rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+}
+.placeholder {
+  color: #999;
+}
+.arrow {
+  font-size: 32rpx;
+  color: #999;
+}
+.textarea {
+  width: 100%;
+  height: 200rpx;
+  border: 1rpx solid #e0e0e0;
+  border-radius: 10rpx;
+  padding: 20rpx;
+  font-size: 28rpx;
+  box-sizing: border-box;
+}
+.counter {
+  font-size: 24rpx;
+  color: #999;
+  text-align: right;
+  display: block;
+  margin-top: 10rpx;
+}
+.btn-submit {
+  width: 100%;
+  height: 90rpx;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  color: #fff;
+  border-radius: 45rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+  margin-top: 40rpx;
+}
+.btn-submit[disabled] {
+  opacity: 0.6;
+}
+</style>

+ 1 - 1
cfc-frontend/pages/discover/product-detail/product-detail.vue

@@ -220,7 +220,7 @@ export default {
     loadSuppliers(productId) {
       var that = this
       uni.request({
-        url: config.api('/api/admin/product/supplier/list'),
+        url: config.api('/api/admin/supplier/product/list'),
         method: 'POST',
         data: { productId: productId },
         header: {

+ 1 - 1
cfc-frontend/pages/guide/bind/invite.vue

@@ -123,7 +123,7 @@ export default {
     loadFamilies() {
       // 获取家庭列表
       uni.request({
-        url: `${getApp().globalData.baseUrl}/api/user/families`,
+        url: `${getApp().globalData.baseUrl}/api/family/user/family-members`,
         header: { Authorization: `Bearer ${uni.getStorageSync('token')}` },
         success: (res) => {
           if (res.data.code === 200) {

+ 2 - 1
cfc-frontend/pages/login/login.vue

@@ -148,8 +148,9 @@ export default {
           uni.showToast({ title: '登录成功', icon: 'success' })
 
           if (res.data.needsRoleSelect) {
+            // 首次登录:跳过角色选择,默认 parent,直接进入信息补充页
             uni.redirectTo({
-              url: '/pages/user-edit/user-edit?token=' + res.data.token + '&userId=' + res.data.userId + '&needsRoleSelect=true'
+              url: '/pages/user-edit/user-edit?token=' + res.data.token + '&userId=' + res.data.userId + '&autoParent=true'
             })
           } else {
             self.handlePostLoginRouting()

+ 1 - 1
cfc-frontend/pages/mind-detail/emotion-checkin.vue

@@ -719,7 +719,7 @@ export default {
       var mediaPath = this.photoPath || this.videoPath
       if (mediaPath) {
         uni.uploadFile({
-          url: config.API_BASE_URL + '/api/upload',
+          url: config.API_BASE_URL + '/api/media/upload',
           filePath: mediaPath,
           name: 'file',
           success: (uploadRes) => {

+ 1 - 1
cfc-frontend/pages/mind/emotion-checkin.vue

@@ -529,7 +529,7 @@ export default {
 
       if (this.photoPath) {
         uni.uploadFile({
-          url: config.API_BASE_URL + '/api/upload',
+          url: config.API_BASE_URL + '/api/media/upload',
           filePath: this.photoPath,
           name: 'file',
           success: (uploadRes) => {

+ 153 - 0
cfc-frontend/pages/nutritionist/apply/index.vue

@@ -0,0 +1,153 @@
+<template>
+  <view class="container">
+    <view class="header">
+      <text class="title">成为营养师</text>
+      <text class="subtitle">提交您的专业资质,成为认证家庭营养师</text>
+    </view>
+
+    <view class="form">
+      <view class="form-item">
+        <text class="label">真实姓名</text>
+        <input class="input" v-model="formData.realName" placeholder="请输入真实姓名" />
+      </view>
+
+      <view class="form-item">
+        <text class="label">手机号</text>
+        <input class="input" v-model="formData.phone" type="number" placeholder="请输入手机号" maxlength="11" />
+      </view>
+
+      <view class="form-item">
+        <text class="label">专业资质说明</text>
+        <textarea class="textarea" v-model="formData.qualification" placeholder="请说明您的营养师资质、从业经验等" maxlength="500" />
+        <text class="counter">{{ formData.qualification.length }}/500</text>
+      </view>
+
+      <button class="btn-submit" :disabled="submitting" @click="handleSubmit">
+        {{ submitting ? '提交中...' : '提交申请' }}
+      </button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { nutritionistApply } from '../../../utils/api'
+
+export default {
+  data() {
+    return {
+      formData: {
+        realName: '',
+        phone: '',
+        qualification: ''
+      },
+      submitting: false
+    }
+  },
+  methods: {
+    async handleSubmit() {
+      if (!this.formData.realName) {
+        uni.showToast({ title: '请输入真实姓名', icon: 'none' })
+        return
+      }
+      if (!this.formData.phone) {
+        uni.showToast({ title: '请输入手机号', icon: 'none' })
+        return
+      }
+      this.submitting = true
+      try {
+        const res = await nutritionistApply(this.formData)
+        if (res.code === 200) {
+          uni.showModal({
+            title: '申请成功',
+            content: '您的营养师申请已提交,请等待审核',
+            showCancel: false,
+            success: () => uni.navigateBack()
+          })
+        } else {
+          uni.showToast({ title: res.message || '提交失败', icon: 'none' })
+        }
+      } catch (e) {
+        uni.showToast({ title: '提交失败', icon: 'none' })
+      } finally {
+        this.submitting = false
+      }
+    }
+  }
+}
+</script>
+
+<style>
+.container {
+  padding: 30rpx;
+  background: #f8f8f8;
+  min-height: 100vh;
+}
+.header {
+  text-align: center;
+  padding: 40rpx 0;
+}
+.title {
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #333;
+}
+.subtitle {
+  font-size: 28rpx;
+  color: #666;
+  margin-top: 16rpx;
+  display: block;
+}
+.form {
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 40rpx;
+}
+.form-item {
+  margin-bottom: 40rpx;
+}
+.label {
+  font-size: 28rpx;
+  color: #333;
+  display: block;
+  margin-bottom: 20rpx;
+  font-weight: bold;
+}
+.input {
+  width: 100%;
+  height: 80rpx;
+  border: 1rpx solid #e0e0e0;
+  border-radius: 10rpx;
+  padding: 0 20rpx;
+  font-size: 28rpx;
+  box-sizing: border-box;
+}
+.textarea {
+  width: 100%;
+  height: 200rpx;
+  border: 1rpx solid #e0e0e0;
+  border-radius: 10rpx;
+  padding: 20rpx;
+  font-size: 28rpx;
+  box-sizing: border-box;
+}
+.counter {
+  font-size: 24rpx;
+  color: #999;
+  text-align: right;
+  display: block;
+  margin-top: 10rpx;
+}
+.btn-submit {
+  width: 100%;
+  height: 90rpx;
+  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+  color: #fff;
+  border-radius: 45rpx;
+  font-size: 32rpx;
+  font-weight: bold;
+  margin-top: 40rpx;
+}
+.btn-submit[disabled] {
+  opacity: 0.6;
+}
+</style>

+ 564 - 15
cfc-frontend/pages/promotion/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <scroll-view class="container" scroll-y>
+  <scroll-view class="container" scroll-y scroll-with-animation>
     <!-- 邀请码区域 -->
     <view class="invite-card">
       <view class="code-section">
@@ -13,6 +13,103 @@
       <button class="share-btn" @click="shareCard">分享邀请卡</button>
     </view>
 
+    <!-- 家庭公共收益总览 -->
+    <view class="family-earnings-card" v-if="familySummary">
+      <view class="fe-header">
+        <view class="fe-title-row">
+          <text class="fe-title">🏠 家庭公共收益</text>
+          <text class="fe-badge" v-if="isAdmin">管理员</text>
+        </view>
+        <text class="fe-subtitle">家庭成员共同努力的成果</text>
+      </view>
+      <view class="fe-grid">
+        <view class="fe-item">
+          <text class="fe-value orange">{{ fenToYuan(familySummary.totalEarned) }}</text>
+          <text class="fe-label">累计推荐收入</text>
+        </view>
+        <view class="fe-item">
+          <text class="fe-value blue">{{ fenToYuan(familySummary.availableAmount) }}</text>
+          <text class="fe-label">可支配余额</text>
+        </view>
+        <view class="fe-item">
+          <text class="fe-value green">{{ fenToYuan(familySummary.withdrawnAmount) }}</text>
+          <text class="fe-label">已提现</text>
+        </view>
+        <view class="fe-item">
+          <text class="fe-value purple">{{ fenToYuan(familySummary.distributedAmount) }}</text>
+          <text class="fe-label">已分配</text>
+        </view>
+      </view>
+
+      <!-- 管理员操作按钮(仅管理员可见) -->
+      <view class="fe-actions" v-if="isAdmin">
+        <button class="fe-btn fe-btn-withdraw" @click="showWithdrawSheet = true">提现</button>
+        <button class="fe-btn fe-btn-distribute" @click="showDistributeSheet = true">分配收益</button>
+      </view>
+    </view>
+
+    <!-- 成员贡献榜 -->
+    <view class="members-card" v-if="members && members.length > 0">
+      <view class="members-header">
+        <text class="members-title">👥 成员贡献榜</text>
+        <text class="members-toggle" @click="membersExpanded = !membersExpanded">
+          {{ membersExpanded ? '收起' : '展开全部(' + members.length + ')' }}
+        </text>
+      </view>
+      <view class="member-list">
+        <view class="member-item" v-for="(m, idx) in displayMembers" :key="m.userId">
+          <view class="member-rank">
+            <text class="rank-num" v-if="idx < 3 && !showAllRanks">🏅</text>
+            <text class="rank-num rank-plain" v-else>{{ idx + 1 }}</text>
+          </view>
+          <image v-if="m.avatar" class="member-avatar" :src="m.avatar" mode="aspectFill"></image>
+          <text v-else class="member-avatar-placeholder">{{ m.nickname ? m.nickname.charAt(0) : '?' }}</text>
+          <view class="member-info">
+            <text class="member-name">{{ m.nickname || '用户' }}</text>
+            <text class="member-role-tag" v-if="m.isAdmin">管理员</text>
+            <text class="member-balance-tag" v-if="m.canUseFamilyBalance">池可用</text>
+            <text class="member-balance-tag disabled-tag" v-else>池关闭</text>
+          </view>
+          <view class="member-amounts">
+            <text class="member-amount allocated">+{{ fenToYuan(m.allocatedAmount) }}</text>
+            <text class="member-amount consumed">-{{ fenToYuan(m.consumedAmount) }}</text>
+            <text class="member-amount available">={{ fenToYuan(m.availableAmount) }}</text>
+          </view>
+          <!-- 管理员可切换成员池权限 -->
+          <switch v-if="isAdmin && !m.isAdmin" class="member-switch" :checked="m.canUseFamilyBalance" @change="toggleMemberAccess(m)" color="#F97316"></switch>
+        </view>
+      </view>
+    </view>
+
+    <!-- 提现弹窗 -->
+    <view class="sheet-mask" v-if="showWithdrawSheet" @click="showWithdrawSheet = false">
+      <view class="sheet-content" @click.stop>
+        <text class="sheet-title">家庭收益提现</text>
+        <text class="sheet-hint">可提现余额: {{ fenToYuan(familySummary ? familySummary.availableAmount : 0) }}</text>
+        <input class="sheet-input" type="digit" v-model="withdrawAmount" placeholder="输入提现金额(分)" />
+        <view class="sheet-actions">
+          <button class="sheet-cancel" @click="showWithdrawSheet = false">取消</button>
+          <button class="sheet-confirm" @click="doWithdraw" :disabled="!withdrawAmount || withdrawAmount <= 0">确认提现</button>
+        </view>
+      </view>
+    </view>
+
+    <!-- 分配弹窗 -->
+    <view class="sheet-mask" v-if="showDistributeSheet" @click="showDistributeSheet = false">
+      <view class="sheet-content" @click.stop>
+        <text class="sheet-title">分配收益</text>
+        <text class="sheet-hint">选择成员并输入分配金额(分)</text>
+        <picker class="sheet-picker" mode="selector" :range="memberOptions" :value="distributeMemberIdx" @change="onDistributeMemberChange">
+          <text>{{ distributeMemberIdx >= 0 ? memberOptions[distributeMemberIdx] : '选择成员' }}</text>
+        </picker>
+        <input class="sheet-input" type="digit" v-model="distributeAmount" placeholder="输入分配金额(分)" />
+        <view class="sheet-actions">
+          <button class="sheet-cancel" @click="showDistributeSheet = false">取消</button>
+          <button class="sheet-confirm" @click="doDistribute" :disabled="distributeMemberIdx < 0 || !distributeAmount || distributeAmount <= 0">确认分配</button>
+        </view>
+      </view>
+    </view>
+
     <!-- 统计卡片 -->
     <view class="stats-cards">
       <view class="stat-card today-card">
@@ -33,15 +130,14 @@
     <view class="funnel-section" v-if="funnelSteps && funnelSteps.length > 0">
       <text class="section-title">转化漏斗</text>
       <view class="funnel">
-        <view class="funnel-step" v-for="(step, index) in funnelSteps" :key="index"
-              :style="{width: step.width + '%'}">
+        <view class="funnel-step" v-for="(step, index) in funnelSteps" :key="index" :style="{width: step.width + '%'}">
           <text class="funnel-label">{{ step.label }}</text>
           <text class="funnel-count">{{ step.count }}</text>
         </view>
       </view>
     </view>
 
-    <!-- 收益概览 -->
+    <!-- 收益总览 -->
     <view class="earnings-card">
       <view class="earnings-header">
         <text class="earnings-title">收益总览</text>
@@ -75,7 +171,7 @@
         </view>
         <text class="menu-text">佣金明细</text>
       </view>
-      <view class="menu-item" @click="goWithdraw">
+      <view class="menu-item" @click="goWithdraw" v-if="!isChild">
         <view class="menu-icon-wrap icon-withdraw">
           <text class="menu-icon-text">💰</text>
         </view>
@@ -99,15 +195,23 @@
         </view>
         <text class="menu-text">推广排行榜</text>
       </view>
+      <view class="menu-item" @click="goRecords" v-if="isAdmin">
+        <view class="menu-icon-wrap icon-records">
+          <text class="menu-icon-text">📊</text>
+        </view>
+        <text class="menu-text">家庭流水</text>
+      </view>
     </view>
 
-    <SharePoster :show="showPoster" :referralCode="referralCode" :qrCodeBase64="qrCodeBase64" :nickname="userNickname" :userAvatar="userAvatar" @close="showPoster = false" />
+    <!-- 底部安全区 -->
+    <view style="height:40rpx"></view>
 
+    <SharePoster :show="showPoster" :referralCode="referralCode" :qrCodeBase64="qrCodeBase64" :nickname="userNickname" :userAvatar="userAvatar" @close="showPoster = false" />
   </scroll-view>
 </template>
 
 <script>
-import { getReferralCode, getReferralSummary, getCommissionSummary, getInviteQrCode } from '../../utils/api.js'
+import { getReferralCode, getReferralSummary, getCommissionSummary, getInviteQrCode, getFamilyEarningsSummary, getFamilyEarningsMembers, getFamilyEarningsRecords, distributeToMember, toggleMemberBalance, withdrawFamilyEarnings } from '../../utils/api.js'
 import SharePoster from '@/components/SharePoster.vue'
 
 export default {
@@ -124,12 +228,41 @@ export default {
       userNickname: '',
       stats: {},
       funnelData: {},
-      funnelSteps: []
+      funnelSteps: [],
+      // 家庭收益
+      familySummary: null,
+      members: [],
+      membersExpanded: false,
+      showAllRanks: false,
+      // 弹窗
+      showWithdrawSheet: false,
+      showDistributeSheet: false,
+      withdrawAmount: '',
+      distributeAmount: '',
+      distributeMemberIdx: -1,
+      memberOptions: []
     }
   },
   computed: {
     isLoggedIn() {
       return !!uni.getStorageSync('token')
+    },
+    role() {
+      return uni.getStorageSync('role') || ''
+    },
+    isAdmin() {
+      // 管理员 = parent 或 teacher 角色
+      var r = this.role
+      return r === 'parent' || r === 'teacher'
+    },
+    isChild() {
+      return this.role === 'child'
+    },
+    displayMembers() {
+      if (this.membersExpanded || this.showAllRanks) {
+        return this.members
+      }
+      return this.members.slice(0, 5)
     }
   },
   onLoad() {
@@ -138,6 +271,7 @@ export default {
   onShow() {
     this.loadStats()
     this.loadFunnelData()
+    this.loadFamilyData()
   },
   onShareAppMessage() {
     var code = this.referralCode || ''
@@ -154,7 +288,7 @@ export default {
   methods: {
     async loadData() {
       try {
-        const codeRes = await getReferralCode()
+        var codeRes = await getReferralCode()
         if (codeRes.data) {
           this.referralCode = codeRes.data.referralCode || codeRes.data.code || ''
         }
@@ -162,7 +296,7 @@ export default {
         console.error('获取邀请码失败', e)
       }
       try {
-        const summaryRes = await getReferralSummary()
+        var summaryRes = await getReferralSummary()
         if (summaryRes.data) {
           this.totalEarnings = summaryRes.data.totalEarnings || '0.00'
         }
@@ -170,7 +304,7 @@ export default {
         console.error('获取邀请统计失败', e)
       }
       try {
-        const comRes = await getCommissionSummary()
+        var comRes = await getCommissionSummary()
         if (comRes.data) {
           this.summary = comRes.data
           this.availableAmount = comRes.data.availableAmount || '0.00'
@@ -179,7 +313,38 @@ export default {
         console.error('获取佣金总览失败', e)
       }
     },
-    loadStats: function() {
+    async loadFamilyData() {
+      if (this.isChild) {
+        // 孩子只读:仅加载概要,不加载管理员功能
+        try {
+          var sRes = await getFamilyEarningsSummary()
+          if (sRes.data) {
+            this.familySummary = sRes.data
+            this.members = sRes.data.members || []
+          }
+        } catch (e) {
+          console.error('获取家庭收益概览失败', e)
+        }
+        return
+      }
+      try {
+        var sRes = await getFamilyEarningsSummary()
+        if (sRes.data) {
+          this.familySummary = sRes.data
+          this.members = sRes.data.members || []
+          // 构建picker选项
+          var opts = []
+          var arr = this.members
+          for (var i = 0; i < arr.length; i++) {
+            opts.push((arr[i].nickname || '用户' + arr[i].userId) + ' (余额:' + this.fenToYuan(arr[i].availableAmount) + ')')
+          }
+          this.memberOptions = opts
+        }
+      } catch (e) {
+        console.error('获取家庭收益概览失败', e)
+      }
+    },
+    loadStats() {
       var self = this
       var token = uni.getStorageSync('token')
       var baseUrl = ''
@@ -200,7 +365,7 @@ export default {
         }
       })
     },
-    loadFunnelData: function() {
+    loadFunnelData() {
       var self = this
       var token = uni.getStorageSync('token')
       var baseUrl = ''
@@ -222,7 +387,7 @@ export default {
         }
       })
     },
-    buildFunnelSteps: function() {
+    buildFunnelSteps() {
       var data = this.funnelData
       var max = Math.max(data.invites || 1, data.registered || 0, data.purchased || 0, data.repeatPurchased || 0, data.totalOrders || 0)
       if (max < 1) max = 1
@@ -234,6 +399,95 @@ export default {
         { label: '订单', count: data.totalOrders || 0, width: Math.round(((data.totalOrders || 0) / max) * 100) }
       ]
     },
+    fenToYuan(fen) {
+      if (fen === null || fen === undefined) return '0.00'
+      var num = Number(fen)
+      if (isNaN(num)) return '0.00'
+      return (num / 100).toFixed(2)
+    },
+    formatPriceWithSymbol(val) {
+      if (!val && val !== 0) return '¥0.00'
+      var num = Number(val)
+      if (isNaN(num)) return '¥0.00'
+      // val 已经是元单位(后端返回的 commission summary 是元)
+      return '¥' + Number(num).toFixed(2)
+    },
+    // 管理员操作
+    toggleMemberAccess(m) {
+      var self = this
+      var enabled = !m.canUseFamilyBalance
+      uni.showLoading({ title: '操作中...' })
+      toggleMemberBalance({ userId: m.userId, enabled: enabled }).then(function(res) {
+        uni.hideLoading()
+        if (res.code === 200) {
+          m.canUseFamilyBalance = enabled
+          uni.showToast({ title: '操作成功', icon: 'success' })
+        } else {
+          uni.showToast({ title: res.message || '操作失败', icon: 'none' })
+        }
+      }).catch(function(e) {
+        uni.hideLoading()
+        uni.showToast({ title: '操作失败', icon: 'none' })
+      })
+    },
+    onDistributeMemberChange(e) {
+      this.distributeMemberIdx = e.detail.value
+    },
+    doDistribute() {
+      var idx = this.distributeMemberIdx
+      if (idx < 0 || !this.members[idx]) {
+        uni.showToast({ title: '请选择成员', icon: 'none' })
+        return
+      }
+      var amount = Number(this.distributeAmount)
+      if (!amount || amount <= 0) {
+        uni.showToast({ title: '请输入有效金额', icon: 'none' })
+        return
+      }
+      var self = this
+      uni.showLoading({ title: '分配中...' })
+      distributeToMember({ userId: this.members[idx].userId, amount: amount }).then(function(res) {
+        uni.hideLoading()
+        if (res.code === 200) {
+          uni.showToast({ title: '分配成功', icon: 'success' })
+          self.showDistributeSheet = false
+          self.distributeAmount = ''
+          self.distributeMemberIdx = -1
+          self.loadFamilyData()
+        } else {
+          uni.showToast({ title: res.message || '分配失败', icon: 'none' })
+        }
+      }).catch(function(e) {
+        uni.hideLoading()
+        uni.showToast({ title: '分配失败', icon: 'none' })
+      })
+    },
+    doWithdraw() {
+      var amount = Number(this.withdrawAmount)
+      if (!amount || amount <= 0) {
+        uni.showToast({ title: '请输入有效金额', icon: 'none' })
+        return
+      }
+      var self = this
+      uni.showLoading({ title: '提现中...' })
+      withdrawFamilyEarnings({ amount: amount }).then(function(res) {
+        uni.hideLoading()
+        if (res.code === 200) {
+          uni.showToast({ title: '提现申请已提交', icon: 'success' })
+          self.showWithdrawSheet = false
+          self.withdrawAmount = ''
+          self.loadFamilyData()
+        } else {
+          uni.showToast({ title: res.message || '提现失败', icon: 'none' })
+        }
+      }).catch(function(e) {
+        uni.hideLoading()
+        uni.showToast({ title: '提现失败', icon: 'none' })
+      })
+    },
+    goRecords() {
+      uni.navigateTo({ url: '/pages/promotion/records' })
+    },
     copyCode() {
       if (!this.referralCode) return
       uni.setClipboardData({
@@ -331,6 +585,300 @@ export default {
 .share-btn::after { border: none; }
 .share-btn:active { opacity: 0.8; }
 
+/* ===== 家庭公共收益卡 ===== */
+.family-earnings-card {
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 30rpx;
+  margin-bottom: 30rpx;
+  box-shadow: 0 2rpx 12rpx rgba(249,115,22,0.08);
+  border-left: 6rpx solid #F97316;
+}
+.fe-header {
+  margin-bottom: 24rpx;
+}
+.fe-title-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.fe-title {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #1E293B;
+}
+.fe-badge {
+  font-size: 20rpx;
+  color: #F97316;
+  background: #FFF7ED;
+  padding: 4rpx 14rpx;
+  border-radius: 20rpx;
+}
+.fe-subtitle {
+  font-size: 22rpx;
+  color: #94A3B8;
+  margin-top: 6rpx;
+  display: block;
+}
+.fe-grid {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 20rpx;
+}
+.fe-item {
+  width: 50%;
+  text-align: center;
+  padding: 16rpx 0;
+}
+.fe-value {
+  font-size: 36rpx;
+  font-weight: bold;
+  display: block;
+}
+.fe-value.orange { color: #F97316; }
+.fe-value.blue { color: #0EA5E9; }
+.fe-value.green { color: #10B981; }
+.fe-value.purple { color: #8B5CF6; }
+.fe-label {
+  font-size: 22rpx;
+  color: #94A3B8;
+  margin-top: 6rpx;
+  display: block;
+}
+.fe-actions {
+  display: flex;
+  gap: 20rpx;
+  padding-top: 16rpx;
+  border-top: 1rpx solid #FED7AA;
+}
+.fe-btn {
+  flex: 1;
+  height: 64rpx;
+  line-height: 64rpx;
+  font-size: 26rpx;
+  border-radius: 32rpx;
+  text-align: center;
+}
+.fe-btn::after { border: none; }
+.fe-btn-withdraw {
+  background: #F97316;
+  color: #fff;
+}
+.fe-btn-distribute {
+  background: #FFF7ED;
+  color: #F97316;
+  border: 1rpx solid #FED7AA;
+}
+
+/* ===== 成员贡献榜 ===== */
+.members-card {
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 30rpx;
+  margin-bottom: 30rpx;
+  box-shadow: 0 2rpx 12rpx rgba(249,115,22,0.08);
+}
+.members-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 20rpx;
+}
+.members-title {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #1E293B;
+}
+.members-toggle {
+  font-size: 24rpx;
+  color: #F97316;
+}
+.member-list {
+  display: flex;
+  flex-direction: column;
+}
+.member-item {
+  display: flex;
+  align-items: center;
+  padding: 16rpx 0;
+  border-bottom: 1rpx solid #FFF7ED;
+}
+.member-item:last-child {
+  border-bottom: none;
+}
+.member-rank {
+  width: 48rpx;
+  flex-shrink: 0;
+  text-align: center;
+}
+.rank-num {
+  font-size: 28rpx;
+}
+.rank-plain {
+  font-size: 24rpx;
+  color: #94A3B8;
+  font-weight: 500;
+}
+.member-avatar {
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: 50%;
+  margin-right: 16rpx;
+  flex-shrink: 0;
+  background: #FEF3C7;
+}
+.member-avatar-placeholder {
+  width: 56rpx;
+  height: 56rpx;
+  border-radius: 50%;
+  margin-right: 16rpx;
+  flex-shrink: 0;
+  background: #FEF3C7;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 24rpx;
+  color: #F97316;
+  text-align: center;
+  line-height: 56rpx;
+}
+.member-info {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8rpx;
+}
+.member-name {
+  font-size: 26rpx;
+  color: #1E293B;
+  font-weight: 500;
+  max-width: 140rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.member-role-tag {
+  font-size: 18rpx;
+  color: #fff;
+  background: #F97316;
+  padding: 2rpx 10rpx;
+  border-radius: 12rpx;
+}
+.member-balance-tag {
+  font-size: 18rpx;
+  color: #10B981;
+  background: #D1FAE5;
+  padding: 2rpx 10rpx;
+  border-radius: 12rpx;
+}
+.member-balance-tag.disabled-tag {
+  color: #94A3B8;
+  background: #F1F5F9;
+}
+.member-amounts {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  margin-right: 12rpx;
+  flex-shrink: 0;
+}
+.member-amount {
+  font-size: 20rpx;
+  line-height: 1.6;
+}
+.member-amount.allocated { color: #10B981; }
+.member-amount.consumed { color: #EF4444; }
+.member-amount.available { color: #F97316; font-weight: 600; }
+.member-switch {
+  transform: scale(0.7);
+  flex-shrink: 0;
+}
+
+/* ===== 弹窗 ===== */
+.sheet-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0,0,0,0.4);
+  z-index: 999;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+}
+.sheet-content {
+  background: #fff;
+  border-radius: 30rpx 30rpx 0 0;
+  padding: 40rpx 32rpx;
+  padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
+  width: 100%;
+  max-width: 750rpx;
+  box-sizing: border-box;
+}
+.sheet-title {
+  font-size: 32rpx;
+  font-weight: 600;
+  color: #1E293B;
+  display: block;
+  margin-bottom: 12rpx;
+}
+.sheet-hint {
+  font-size: 24rpx;
+  color: #94A3B8;
+  display: block;
+  margin-bottom: 24rpx;
+}
+.sheet-input {
+  height: 80rpx;
+  border: 1rpx solid #FED7AA;
+  border-radius: 16rpx;
+  padding: 0 24rpx;
+  font-size: 28rpx;
+  color: #1E293B;
+  margin-bottom: 24rpx;
+}
+.sheet-picker {
+  height: 80rpx;
+  border: 1rpx solid #FED7AA;
+  border-radius: 16rpx;
+  padding: 0 24rpx;
+  font-size: 26rpx;
+  color: #1E293B;
+  margin-bottom: 24rpx;
+  display: flex;
+  align-items: center;
+}
+.sheet-actions {
+  display: flex;
+  gap: 20rpx;
+}
+.sheet-cancel {
+  flex: 1;
+  height: 72rpx;
+  line-height: 72rpx;
+  background: #F1F5F9;
+  color: #64748B;
+  font-size: 28rpx;
+  border-radius: 36rpx;
+}
+.sheet-cancel::after { border: none; }
+.sheet-confirm {
+  flex: 1;
+  height: 72rpx;
+  line-height: 72rpx;
+  background: #F97316;
+  color: #fff;
+  font-size: 28rpx;
+  border-radius: 36rpx;
+}
+.sheet-confirm::after { border: none; }
+.sheet-confirm[disabled] {
+  opacity: 0.5;
+}
+
 /* ===== 统计卡片 ===== */
 .stats-cards {
   display: flex;
@@ -460,7 +1008,7 @@ export default {
   box-shadow: 0 2rpx 12rpx rgba(249,115,22,0.08);
 }
 .menu-item {
-  width: 50%;
+  width: 33.33%;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -481,6 +1029,7 @@ export default {
 .icon-invite { background: #D1FAE5; }
 .icon-team { background: #FCE7F3; }
 .icon-leaderboard { background: #FFF3CD; }
+.icon-records { background: #EDE9FE; }
 .menu-icon-text {
   font-size: 36rpx;
 }

+ 2 - 2
cfc-frontend/pages/teacher/chat.vue

@@ -53,7 +53,7 @@ export default {
     async loadMessages() {
       try {
         const res = await uni.request({
-          url: `${getApp().globalData.baseUrl}/api/guide/messages/${this.conversationId}`,
+          url: `${getApp().globalData.baseUrl}/api/guide/messages/${this.conversationId}/reply`,
           method: 'GET',
           header: { Authorization: `Bearer ${uni.getStorageSync('token')}` }
         })
@@ -89,7 +89,7 @@ export default {
 
       try {
         await uni.request({
-          url: `${getApp().globalData.baseUrl}/api/guide/messages`,
+          url: `${getApp().globalData.baseUrl}/api/guide/messages/list`,
           method: 'POST',
           header: { Authorization: `Bearer ${uni.getStorageSync('token')}` },
           data: {

+ 39 - 9
cfc-frontend/pages/user-edit/user-edit.vue

@@ -136,6 +136,12 @@
 				</picker>
 			</view>
 
+			<!-- 地址选择 -->
+			<view class="form-item">
+				<text class="label">所在地区 <text class="required" v-if="isNewUserFlow">*</text></text>
+				<AddressPicker ref="addressPicker" />
+			</view>
+
 			<!-- 兴趣爱好 -->
 			<view class="form-item">
 				<text class="label">兴趣爱好</text>
@@ -248,8 +254,12 @@
 
 <script>
 import { updateUserInfo, joinFamily, createFamily, directRegister, getUserInfo } from '../../utils/api.js'
+import AddressPicker from '../../components/address-picker.vue'
 
 export default {
+	components: {
+		AddressPicker
+	},
 	data() {
 		return {
 			isEdit: false,
@@ -275,7 +285,9 @@ export default {
 				highestEducation: '',
 				maritalStatus: '',
 				hobbies: '',
-				dietPreferences: ''
+				dietPreferences: '',
+				address: '',
+				addressId: null
 			},
 			ethnicityOptions: ['汉族','蒙古族','回族','藏族','维吾尔族','苗族','彝族','壮族','布依族','朝鲜族','满族','侗族','瑶族','白族','土家族','哈尼族','哈萨克族','傣族','黎族','其他'],
 			bloodTypeOptions: ['A','B','AB','O','未知'],
@@ -309,16 +321,27 @@ export default {
 		if (options.token && options.userId) {
 			this.token = options.token
 			this.userId = options.userId
-			
-			// 检查是否需要选择角色(新用户)- 只有明确传递 needsRoleSelect=true 才显示选择
+
+			if (options.autoParent === 'true') {
+				// 首次登录:跳过角色选择,默认 parent,直接进入信息补充页
+				this.showRoleSelect = false
+				this.isEdit = true
+				this.isNewUserFlow = true
+				this.form.role = 'parent'
+			} else {
+				// 检查是否需要选择角色(新用户)- 只有明确传递 needsRoleSelect=true 才显示选择
+				this.showRoleSelect = options.needsRoleSelect === 'true'
+				this.isEdit = !this.showRoleSelect
+				this.isNewUserFlow = options.needsRoleSelect === 'true'
+			}
+		} else if (options.phone && (options.autoParent === 'true' || options.needsRoleSelect === 'true')) {
+			// 测试环境:没有token,只有手机号,是新用户注册流程
 			this.showRoleSelect = options.needsRoleSelect === 'true'
 			this.isEdit = !this.showRoleSelect
-			this.isNewUserFlow = options.needsRoleSelect === 'true'
-		} else if (options.phone && options.needsRoleSelect === 'true') {
-			// 测试环境:没有token,只有手机号,是新用户注册流程
-			this.showRoleSelect = true
-			this.isEdit = false
 			this.isNewUserFlow = true
+			if (options.autoParent === 'true') {
+				this.form.role = 'parent'
+			}
 			// 将手机号传递给表单
 			this.form.phone = options.phone
 		} else {
@@ -430,6 +453,7 @@ export default {
 					this.form.hobbies = userData.hobbies || ''
 					this.form.dietPreferences = userData.dietPreferences || ''
 					this.form.mascot = userData.mascot || ''
+				this.form.address = userData.address || ''
 				}
 			} catch (e) {
 				console.error('加载用户信息失败', e)
@@ -442,6 +466,11 @@ export default {
 				return
 			}
 			
+			// 从 AddressPicker 读取地址文本
+			if (this.$refs.addressPicker && this.$refs.addressPicker.fullAddress) {
+				this.form.address = this.$refs.addressPicker.fullAddress
+			}
+
 			this.loading = true
 			try {
 				await updateUserInfo({
@@ -457,7 +486,8 @@ export default {
 					highestEducation: this.form.highestEducation,
 					maritalStatus: this.form.maritalStatus,
 					hobbies: this.form.hobbies,
-					dietPreferences: this.form.dietPreferences
+					dietPreferences: this.form.dietPreferences,
+					address: this.form.address
 				})
 				uni.showToast({ title: '保存成功', icon: 'success' })
 				setTimeout(() => {

+ 341 - 173
cfc-frontend/pages/wealth/index.vue

@@ -1,8 +1,5 @@
 <template>
   <view class="container">
-    <!-- Tabbar 切换过渡页 -->
-    <tab-transition v-if="showTabTransition" dimCode="wealth" />
-
     <!-- 未登录 -->
     <view v-if="!isLoggedIn" class="login-prompt">
       <view class="prompt-icon">👤</view>
@@ -17,24 +14,125 @@
         tagline="利他创富 · 价值共享"
         quote="富足源于利他与坚持" />
 
-      <!-- 用户信息卡片 -->
-      <view class="user-card" @click="goToProfile">
-        <view class="avatar">👤</view>
-        <view class="user-info">
-          <view class="nickname">{{ nickname || '未设置昵称' }}</view>
-          <view class="role">{{ role === 'parent' ? '家长模式' : (role === 'child' ? '孩子模式' : '成长规划师模式') }}</view>
-        </view>
-        <view class="card-arrow">›</view>
-      </view>
-
       <!-- 退出切换按钮 -->
       <view class="exit-switch" v-if="isSwitchedChild" @click="exitSwitch">
         <text>🔄 退出切换</text>
       </view>
 
-      <!-- 切换按钮 -->
-      <view class="switch-section" v-if="role === 'parent'">
-        <button class="btn-switch" @click="onSwitchMode">切换到孩子</button>
+      <!-- 五行相克状态条(5组) -->
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">⚖️ 身克富平衡</text>
+        </view>
+        <view class="body-wealth-bar" :class="'status-' + bodyWealthStatus">
+          <view class="bar-row">
+            <text class="bar-label">身体底盘</text>
+            <view class="bar-track">
+              <view class="bar-fill body-bar" :style="'width:' + bodyScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ bodyScore }}分</text>
+          </view>
+          <view class="bar-row">
+            <text class="bar-label">财力素养</text>
+            <view class="bar-track">
+              <view class="bar-fill wealth-bar" :style="'width:' + wealthScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ wealthScore }}分</text>
+          </view>
+          <view v-if="bodyWealthMessage" class="bw-message">{{ bodyWealthMessage }}</view>
+        </view>
+      </view>
+
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">⚡ 行克身调节</text>
+        </view>
+        <view class="body-wealth-bar" :class="'status-' + actionBodyStatus">
+          <view class="bar-row">
+            <text class="bar-label">行动能量</text>
+            <view class="bar-track">
+              <view class="bar-fill action-bar" :style="'width:' + actionScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ actionScore }}分</text>
+          </view>
+          <view class="bar-row">
+            <text class="bar-label">身体底盘</text>
+            <view class="bar-track">
+              <view class="bar-fill body-bar" :style="'width:' + bodyScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ bodyScore }}分</text>
+          </view>
+          <view v-if="actionBodyMessage" class="bw-message">{{ actionBodyMessage }}</view>
+        </view>
+      </view>
+
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">💧 富克心平衡</text>
+        </view>
+        <view class="body-wealth-bar" :class="'status-' + wealthHeartStatus">
+          <view class="bar-row">
+            <text class="bar-label">财富能量</text>
+            <view class="bar-track">
+              <view class="bar-fill wealth-bar" :style="'width:' + wealthScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ wealthScore }}分</text>
+          </view>
+          <view class="bar-row">
+            <text class="bar-label">心动能量</text>
+            <view class="bar-track">
+              <view class="bar-fill mind-bar" :style="'width:' + mindScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ mindScore }}分</text>
+          </view>
+          <view v-if="wealthHeartMessage" class="bw-message">{{ wealthHeartMessage }}</view>
+        </view>
+      </view>
+
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">🔥 心克智沉淀</text>
+        </view>
+        <view class="body-wealth-bar" :class="'status-' + mindWisdomStatus">
+          <view class="bar-row">
+            <text class="bar-label">心动能量</text>
+            <view class="bar-track">
+              <view class="bar-fill mind-bar" :style="'width:' + mindScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ mindScore }}分</text>
+          </view>
+          <view class="bar-row">
+            <text class="bar-label">智慧能量</text>
+            <view class="bar-track">
+              <view class="bar-fill wisdom-bar" :style="'width:' + wisdomScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ wisdomScore }}分</text>
+          </view>
+          <view v-if="mindWisdomMessage" class="bw-message">{{ mindWisdomMessage }}</view>
+        </view>
+      </view>
+
+      <view class="section">
+        <view class="section-header">
+          <text class="section-title">⚔️ 智克行滤镜</text>
+        </view>
+        <view class="body-wealth-bar" :class="'status-' + wisdomActionStatus">
+          <view class="bar-row">
+            <text class="bar-label">智慧能量</text>
+            <view class="bar-track">
+              <view class="bar-fill wisdom-bar" :style="'width:' + wisdomScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ wisdomScore }}分</text>
+          </view>
+          <view class="bar-row">
+            <text class="bar-label">行动能量</text>
+            <view class="bar-track">
+              <view class="bar-fill action-bar" :style="'width:' + actionScore + '%'"></view>
+            </view>
+            <text class="bar-value">{{ actionScore }}分</text>
+          </view>
+          <view v-if="wisdomActionMessage" class="bw-message">{{ wisdomActionMessage }}</view>
+        </view>
       </view>
 
       <!-- 财富子维度卡片 -->
@@ -62,17 +160,17 @@
         </view>
         <!-- 孩子版 -->
         <view class="sub-dim-grid" v-else>
-          <view class="sub-dim-card">
+          <view class="sub-dim-card" @click="childSubDimClick('education')">
             <text class="sub-dim-score">{{ wealthEducation || '-' }}</text>
             <text class="sub-dim-label">学业成绩</text>
             <text class="sub-dim-desc">测评综合</text>
           </view>
-          <view class="sub-dim-card">
+          <view class="sub-dim-card" @click="childSubDimClick('social')">
             <text class="sub-dim-score">{{ wealthSocial || '-' }}</text>
             <text class="sub-dim-label">社交筹码</text>
             <text class="sub-dim-desc">活动参与</text>
           </view>
-          <view class="sub-dim-card">
+          <view class="sub-dim-card" @click="childSubDimClick('points')">
             <text class="sub-dim-score">{{ wealthPoints || '-' }}</text>
             <text class="sub-dim-label">规则博弈</text>
             <text class="sub-dim-desc">积分效率</text>
@@ -86,17 +184,17 @@
           <text class="section-title">🔥 心的子维度</text>
         </view>
         <view class="sub-dim-grid heart-sub-dim">
-          <view class="sub-dim-card">
+          <view class="sub-dim-card" @click="childSubDimClick('emotion')">
             <text class="sub-dim-score">{{ heartEmotionStable || '-' }}</text>
             <text class="sub-dim-label">情绪稳定</text>
             <text class="sub-dim-desc">EMI情绪管理</text>
           </view>
-          <view class="sub-dim-card">
+          <view class="sub-dim-card" @click="childSubDimClick('understanding')">
             <text class="sub-dim-score">{{ heartUnderstanding || '-' }}</text>
             <text class="sub-dim-label">理解包容</text>
             <text class="sub-dim-desc">共情+社交适应</text>
           </view>
-          <view class="sub-dim-card">
+          <view class="sub-dim-card" @click="childSubDimClick('legacy')">
             <text class="sub-dim-score">{{ heartLegacy || '-' }}</text>
             <text class="sub-dim-label">传承传递</text>
             <text class="sub-dim-desc">未来开放</text>
@@ -142,22 +240,18 @@
 
       <!-- 底部菜单(精简) -->
       <view class="menu-list">
-        <view class="menu-item" @click="goToProfile">
-          <text>👤 个人中心</text>
+        <view class="menu-item" v-if="role === 'parent'" @click="goToProfile">
+          <text>⚙️ 个人设置</text>
           <text class="arrow">›</text>
         </view>
-        <view class="menu-item" v-if="role === 'parent'" @click="goToPointsLogs">
+        <view class="menu-item" @click="goToPointsLogs">
           <text>📊 积分记录</text>
           <text class="arrow">›</text>
         </view>
-        <view class="menu-item" v-if="role === 'parent'" @click="goToPromotion">
+        <view class="menu-item" @click="goToPromotion">
           <text>📣 推广中心</text>
           <text class="arrow">›</text>
         </view>
-        <view class="menu-item logout-item" @click="logout">
-          <text>🚪 退出登录</text>
-          <text class="arrow">›</text>
-        </view>
       </view>
     </template>
   </view>
@@ -165,23 +259,35 @@
 
 <script>
 import PageBanner from '../../components/PageBanner.vue'
-import TabTransition from '../../components/tab-transition.vue'
-import { getWealthDetail, verifyPassword, getChildren } from '../../utils/api.js'
+import { getWealthDetail, getChildren, switchBackVerify } from '../../utils/api.js'
 
 export default {
-  components: { PageBanner, TabTransition },
+  components: { PageBanner },
   data() {
     return {
-      showTabTransition: true,
-      nickname: '',
       role: 'parent',
       isSwitchedChild: false,
-      // 五维评分(保留用于子维度显示)
+      // 五维评分
       bodyScore: 0,
       mindScore: 0,
       wisdomScore: 0,
       actionScore: 0,
       wealthScore: 0,
+      // 身克富
+      bodyWealthStatus: 'normal',
+      bodyWealthMessage: '',
+      // 行克身
+      actionBodyStatus: 'normal',
+      actionBodyMessage: '',
+      // 富克心
+      wealthHeartStatus: 'normal',
+      wealthHeartMessage: '',
+      // 心克智
+      mindWisdomStatus: 'normal',
+      mindWisdomMessage: '',
+      // 智克行
+      wisdomActionStatus: 'normal',
+      wisdomActionMessage: '',
       // 心的子维度(仅孩子有真实数据)
       heartEmotionStable: null,
       heartUnderstanding: null,
@@ -203,11 +309,7 @@ export default {
     }
   },
   onShow() {
-    this.showTabTransition = true
-    if (!uni.getStorageSync('token')) {
-      this._watchPageReady()
-      return
-    }
+    if (!uni.getStorageSync('token')) return
     var currentRole = uni.getStorageSync('currentRole') || uni.getStorageSync('role') || 'parent'
     if (currentRole === 'teacher') {
       uni.redirectTo({ url: '/pages/teacher/teacher-profile' })
@@ -215,23 +317,10 @@ export default {
     }
     this.role = currentRole
     this.isSwitchedChild = uni.getStorageSync('isSwitchedChild') || false
-    // 加载用户昵称
-    var userInfo = uni.getStorageSync('userInfo')
-    this.nickname = this.$store.state.nickname || (userInfo && userInfo.nickname) || ''
     this.loadChildren()
     this.loadWealthDetail()
-    this._watchPageReady()
   },
   methods: {
-    _watchPageReady() {
-      var self = this
-      this.$nextTick(function() {
-        self.showTabTransition = false
-      })
-      setTimeout(function() {
-        self.showTabTransition = false
-      }, 2000)
-    },
     goLogin() {
       uni.navigateTo({ url: '/pages/login/login' })
     },
@@ -265,6 +354,16 @@ export default {
           this.wisdomScore = d.wisdomScore || 0
           this.actionScore = d.actionScore || 0
           this.wealthScore = d.wealthScore || 0
+          this.bodyWealthStatus = d.bodyWealthStatus || 'normal'
+          this.bodyWealthMessage = d.bodyWealthMessage || ''
+          this.actionBodyStatus = d.actionBodyStatus || 'normal'
+          this.actionBodyMessage = d.actionBodyMessage || ''
+          this.wealthHeartStatus = d.wealthHeartStatus || 'normal'
+          this.wealthHeartMessage = d.wealthHeartMessage || ''
+          this.mindWisdomStatus = d.mindWisdomStatus || 'normal'
+          this.mindWisdomMessage = d.mindWisdomMessage || ''
+          this.wisdomActionStatus = d.wisdomActionStatus || 'normal'
+          this.wisdomActionMessage = d.wisdomActionMessage || ''
           if (memberType === 'parent') {
             this.wealthIncome = d.wealthIncome
             this.wealthAchievement = d.wealthAchievement
@@ -291,13 +390,19 @@ export default {
         success: async (res) => {
           if (res.confirm && res.content) {
             try {
-              var verifyResult = await verifyPassword(res.content)
-              if (verifyResult.code === 200) {
-                this.$store.commit('switchBackToParent')
+              var verifyResult = await switchBackVerify(res.content)
+              if (verifyResult && verifyResult.code === 200 && verifyResult.data === true) {
+                uni.removeStorageSync('isSwitchedChild')
+                uni.removeStorageSync('currentChildId')
                 this.isSwitchedChild = false
                 this.role = 'parent'
+                if (this.$store && this.$store.commit) {
+                  this.$store.commit('switchBackToParent')
+                }
                 uni.showToast({ title: '已退出切换', icon: 'success' })
-                uni.reLaunch({ url: '/pages/index/index' })
+                setTimeout(function() {
+                  uni.reLaunch({ url: '/pages/index/index' })
+                }, 1000)
               } else {
                 uni.showToast({ title: '密码错误', icon: 'none' })
               }
@@ -309,19 +414,19 @@ export default {
       })
     },
     goToCheckin() {
-      uni.navigateTo({ url: '/pages/wealth/checkin' })
+      uni.navigateTo({ url: '/pages/wealth-sub/checkin' })
     },
     goToInsurance() {
-      uni.showToast({ title: '即将上线', icon: 'none' })
+      uni.navigateTo({ url: '/pages/wealth-sub/insurance-list' })
     },
     goToCreator() {
-      uni.showToast({ title: '即将上线', icon: 'none' })
+      uni.navigateTo({ url: '/pages/promotion/index' })
     },
     goToBadges() {
-      uni.showToast({ title: '即将上线', icon: 'none' })
+      uni.navigateTo({ url: '/pages/rewards/badge' })
     },
     goToGrowthReport() {
-      uni.showToast({ title: '即将上线', icon: 'none' })
+      uni.navigateTo({ url: '/pages/growth/index' })
     },
     goToPointsLogs() {
       uni.navigateTo({ url: '/pages/points/points' })
@@ -333,60 +438,27 @@ export default {
       uni.navigateTo({ url: '/pages/profile/index' })
     },
     goToIncome() {
-      uni.showToast({ title: '即将上线', icon: 'none' })
+      uni.navigateTo({ url: '/pages/promotion/commission' })
     },
     goToAchievements() {
-      uni.showToast({ title: '即将上线', icon: 'none' })
+      uni.navigateTo({ url: '/pages/rewards/badge' })
     },
     goToNetwork() {
-      uni.showToast({ title: '即将上线', icon: 'none' })
+      uni.navigateTo({ url: '/pages/promotion/team' })
     },
-    onSwitchMode() {
-      var self = this
-      if (this.children.length === 0) {
-        this.loadChildren()
-        if (this.children.length === 0) {
-          uni.showModal({
-            title: '提示',
-            content: '您还没有添加孩子,是否现在去添加?',
-            success: (res) => {
-              if (res.confirm) {
-                uni.navigateTo({ url: '/pages/profile/create-child' })
-              }
-            }
-          })
-          return
-        }
+    childSubDimClick(key) {
+      var routes = {
+        education: '/pages/assessment/results',
+        social: '/pages/activity/index',
+        points: '/pages/points/mall',
+        emotion: '/pages/mind-detail/emotion-report',
+        understanding: '/pages/mind-detail/emotion-trend',
+        legacy: '/pages/wishes/index'
       }
-      if (this.children.length === 1) {
-        this.$store.commit('switchToChild', this.children[0].id)
-        this.role = 'child'
-        this.isSwitchedChild = true
-        uni.showToast({ title: '已切换为孩子模式', icon: 'success' })
-        return
+      var url = routes[key]
+      if (url) {
+        uni.navigateTo({ url: url })
       }
-      uni.showActionSheet({
-        itemList: this.children.map(function(c) { return c.nickname }),
-        success: function(res) {
-          var selectedChild = self.children[res.tapIndex]
-          self.$store.commit('switchToChild', selectedChild.id)
-          self.role = 'child'
-          self.isSwitchedChild = true
-          uni.showToast({ title: '已切换为' + selectedChild.nickname + '模式', icon: 'success' })
-        }
-      })
-    },
-    logout() {
-      uni.showModal({
-        title: '确认退出',
-        content: '确定要退出登录吗?',
-        success: (res) => {
-          if (res.confirm) {
-            this.$store.commit('logout')
-            uni.reLaunch({ url: '/pages/index/index' })
-          }
-        }
-      })
     }
   }
 }
@@ -414,6 +486,165 @@ export default {
   color: #333;
 }
 
+/* 身克富状态条 */
+.body-wealth-bar {
+  background: #fff;
+  border-radius: 20rpx;
+  padding: 30rpx;
+  box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.06);
+}
+.body-wealth-bar.status-overdraw {
+  background: #FFFBEB;
+  border: 1rpx solid #F59E0B;
+}
+.body-wealth-bar.status-penalty {
+  background: #FEF2F2;
+  border: 1rpx solid #EF4444;
+}
+.bar-row {
+  display: flex;
+  align-items: center;
+  margin-bottom: 16rpx;
+}
+.bar-row:last-of-type {
+  margin-bottom: 0;
+}
+.bar-label {
+  font-size: 26rpx;
+  color: #666;
+  width: 140rpx;
+}
+.bar-track {
+  flex: 1;
+  height: 16rpx;
+  background: #f0f0f0;
+  border-radius: 8rpx;
+  overflow: hidden;
+  margin: 0 16rpx;
+}
+.bar-fill {
+  height: 100%;
+  border-radius: 8rpx;
+  transition: width 0.3s;
+}
+.bar-fill.body-bar {
+  background: linear-gradient(90deg, #FF8C42, #F97316);
+}
+.bar-fill.wealth-bar {
+  background: linear-gradient(90deg, #F59E0B, #FBBF24);
+}
+.bar-fill.action-bar {
+  background: linear-gradient(90deg, #10B981, #34D399);
+}
+.bar-fill.mind-bar {
+  background: linear-gradient(90deg, #FF6B9D, #FF8FAE);
+}
+.bar-fill.wisdom-bar {
+  background: linear-gradient(90deg, #6366F1, #818CF8);
+}
+.bar-value {
+  font-size: 24rpx;
+  color: #999;
+  width: 80rpx;
+  text-align: right;
+}
+.bw-message {
+  margin-top: 16rpx;
+  font-size: 24rpx;
+  color: #666;
+  padding: 12rpx 16rpx;
+  background: rgba(0,0,0,0.03);
+  border-radius: 8rpx;
+}
+.status-overdraw .bw-message {
+  color: #92400E;
+  background: rgba(245,158,11,0.1);
+}
+.status-penalty .bw-message {
+  color: #991B1B;
+  background: rgba(239,68,68,0.1);
+}
+.body-wealth-bar.status-cautious {
+  background: #FFFBEB;
+  border: 1rpx solid #F59E0B;
+}
+.body-wealth-bar.status-balanced {
+  background: #ECFDF5;
+  border: 1rpx solid #10B981;
+}
+.body-wealth-bar.status-eruption {
+  background: #FEF2F2;
+  border: 1rpx solid #EF4444;
+}
+.body-wealth-bar.status-judgmental {
+  background: #FFFBEB;
+  border: 1rpx solid #F59E0B;
+}
+.body-wealth-bar.status-materialized {
+  background: #F0FDF4;
+  border: 1rpx solid #22C55E;
+}
+.body-wealth-bar.status-nourished {
+  background: #ECFDF5;
+  border: 1rpx solid #10B981;
+}
+.body-wealth-bar.status-overprotect {
+  background: #FFF1F2;
+  border: 1rpx solid #FB7185;
+}
+.body-wealth-bar.status-cold_wise {
+  background: #F5F3FF;
+  border: 1rpx solid #8B5CF6;
+}
+.body-wealth-bar.status-blind {
+  background: #F5F3FF;
+  border: 1rpx solid #7C3AED;
+}
+.body-wealth-bar.status-paralysis {
+  background: #F3F4F6;
+  border: 1rpx solid #9CA3AF;
+}
+.status-cautious .bw-message {
+  color: #92400E;
+  background: rgba(245,158,11,0.06);
+}
+.status-balanced .bw-message {
+  color: #065F46;
+  background: rgba(16,185,129,0.06);
+}
+.status-eruption .bw-message {
+  color: #991B1B;
+  background: rgba(239,68,68,0.06);
+}
+.status-judgmental .bw-message {
+  color: #92400E;
+  background: rgba(245,158,11,0.06);
+}
+.status-materialized .bw-message {
+  color: #166534;
+  background: rgba(34,197,94,0.06);
+}
+.status-nourished .bw-message {
+  color: #065F46;
+  background: rgba(16,185,129,0.06);
+}
+.status-overprotect .bw-message {
+  color: #9F1239;
+  background: rgba(251,113,133,0.06);
+}
+.status-cold_wise .bw-message {
+  color: #5B21B6;
+  background: rgba(139,92,246,0.06);
+}
+.status-blind .bw-message {
+  color: #5B21B6;
+  background: rgba(124,58,237,0.06);
+}
+.status-paralysis .bw-message {
+  color: #374151;
+  background: rgba(156,163,175,0.06);
+}
+
 /* 三子维度卡片 */
 .sub-dim-grid {
   display: flex;
@@ -555,67 +786,4 @@ export default {
   font-size: 26rpx;
   color: #92400E;
 }
-
-/* 用户信息卡片 */
-.user-card {
-  display: flex;
-  align-items: center;
-  background: #fff;
-  margin: 20rpx 30rpx;
-  border-radius: 20rpx;
-  padding: 30rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0,0,0,0.06);
-}
-.user-card .avatar {
-  width: 100rpx;
-  height: 100rpx;
-  border-radius: 50%;
-  background: linear-gradient(135deg, #667eea, #764ba2);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 48rpx;
-  margin-right: 24rpx;
-  flex-shrink: 0;
-}
-.user-card .user-info {
-  flex: 1;
-}
-.user-card .nickname {
-  font-size: 34rpx;
-  font-weight: bold;
-  color: #333;
-  margin-bottom: 8rpx;
-}
-.user-card .role {
-  font-size: 24rpx;
-  color: #999;
-}
-.user-card .card-arrow {
-  color: #ccc;
-  font-size: 40rpx;
-}
-
-/* 切换按钮 */
-.switch-section {
-  margin: 0 30rpx 20rpx;
-}
-.btn-switch {
-  width: 100%;
-  background: linear-gradient(135deg, #667eea, #764ba2);
-  color: #fff;
-  font-size: 28rpx;
-  padding: 20rpx;
-  border-radius: 12rpx;
-  line-height: 1.5;
-  border: none;
-}
-.btn-switch::after {
-  border: none;
-}
-
-/* 退出登录菜单项 */
-.logout-item {
-  color: #ff4d4f !important;
-}
 </style>

+ 21 - 1
cfc-frontend/utils/api.js

@@ -169,7 +169,7 @@ export const joinFamily = (inviteCode) => {
 }
 
 export const createFamily = (name) => {
-	return request('/api/user/create-family', 'POST', { name })
+	return request('/api/family/user/create-family', 'POST', { name })
 }
 
 // 获取家庭所有成员(家长+孩子)
@@ -1036,6 +1036,18 @@ export const vendorStatus = () => {
   return request('/api/vendor/status', 'POST', {})
 }
 
+export const nutritionistApply = (data) => {
+  return request('/api/nutritionist/apply', 'POST', data)
+}
+
+export const nutritionistStatus = () => {
+  return request('/api/nutritionist/status', 'POST', {})
+}
+
+export const butlerApply = (data) => {
+  return request('/api/butler/apply', 'POST', data)
+}
+
 // 获取服务商信息
 export const vendorInfo = () => {
   return request('/api/vendor/info', 'POST', {})
@@ -1473,6 +1485,14 @@ export const getMyEarnings = () => request('/api/commission/my-earnings', 'POST'
 export const getCommissionRecords = (page, size) => request('/api/commission/records', 'POST', { page: page || 1, size: size || 20 })
 export const getPpointProducts = () => request('/api/commission/ppoint/products', 'POST')
 
+// ===== 家庭收益(推广中心重构) =====
+export const getFamilyEarningsSummary = () => request('/api/earnings/family/summary', 'POST')
+export const getFamilyEarningsMembers = () => request('/api/earnings/family/members', 'POST')
+export const getFamilyEarningsRecords = (data) => request('/api/earnings/family/records', 'POST', data || {})
+export const distributeToMember = (data) => request('/api/earnings/admin/distribute', 'POST', data)
+export const toggleMemberBalance = (data) => request('/api/earnings/admin/toggle-member', 'POST', data)
+export const withdrawFamilyEarnings = (data) => request('/api/earnings/admin/withdraw', 'POST', data)
+
 // ===== 缁村害浠诲姟锛堝甫 category 绛涢€夛級 =====
 export const getTodayTasksByCategory = (childId, category) => {
   return request('/api/tasks/today', 'POST', { childId: childId, category: category })

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-67105bada7ecd5c837d5b3e8ea3e89876e0fd293
+7d9a1aea5b80753b53d654806d93c676d59be8b5

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.333",
+  "version": "1.0.373",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.333",
+      "version": "1.0.373",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.333",
+  "version": "1.0.374",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 411 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,417 @@
 
 ---
 
+## v1.0.374 (2026-07-16)
+
+### 新功能
+- 首次登录跳过角色选择直接进入信息补充页(默认parent)+ 地址四级选择器
+
+### 其他
+- - user-edit.vue: autoParent 模式下默认 parent,嵌入 AddressPicker 四级地址组件
+- - UpdateUserDTO + UserController + UserService: 扩展 address 字段支持
+- - schema.sql: users 表同步 address 列
+- 
+
+
+## v1.0.373 (2026-07-16)
+
+### 文档
+- add extracted JSON reports for 5 test PDFs
+- refactor to single-PDF-in structured JSON mode + add phylum/disease bacteria tables
+- cleanup old scripts and temporary CSV artifacts
+
+### 其他
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- - PHYLUM_TABLE_TITLES + _parse_phylum_tables() for phylum-level extraction
+- - DISEASE_BACTERIA_TITLES + _parse_disease_bacteria() for obesity/constipation/depression etc.
+- - main() now takes PDF path as arg, outputs same-name .json file
+- - Fallthrough terminator extended, CSV output covers all new table types
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+
+
+## v1.0.372 (2026-07-16)
+
+### Bug 修复
+- 修复拖动时按比例分配算法,首维度多分配问题
+
+
+## v1.0.371 (2026-07-16)
+
+### 新功能
+- 营养师/管家小程序入驻申请流程
+
+### 其他
+- - 小程序: 新增 pages/nutritionist/apply 营养师入驻页面
+- - 小程序: 新增 pages/butler/apply 管家入驻页面
+- - pages.json: 注册 nutritionist/butler 两个子包
+- - api.js: 新增 nutritionistApply/nutritionistStatus/butlerApply 函数
+- 
+
+
+## v1.0.370 (2026-07-16)
+
+### Bug 修复
+- ArticleManage分页onPageChange未接收页码参数; 增加每页条数选择器
+
+
+## v1.0.369 (2026-07-16)
+
+### 文档
+- add bacteria composition tables extraction (core genus/probiotics/harmful/pathogens) for triplet format
+
+### 其他
+- 
+
+### 新功能
+- 文章/套餐审核添加详情弹窗、驳回原因显示、批量通过/驳回
+
+
+## v1.0.368 (2026-07-16)
+
+### Bug 修复
+- 活动列表滚动容器统一用overflow:auto消除分页导致的宽度抖动
+
+
+## v1.0.367 (2026-07-16)
+
+### 文档
+- fix JSON triplet whitelist filtering + name/age/gender regex + vitamin B1/B12 overlap bug
+
+### 其他
+- 
+
+
+## v1.0.366 (2026-07-16)
+
+### 文档
+- fix 朱 food table extraction (compressed detection + ref lookup) + regenerate CSV
+
+### 其他
+- 
+
+
+## v1.0.365 (2026-07-16)
+
+### 文档
+- fix neurotransmitter dedup + regenerate all CSV with corrected data
+
+### 其他
+- 
+
+
+## v1.0.364 (2026-07-16)
+
+### 新功能
+- 添加营养师/管家申请API
+
+
+## v1.0.363 (2026-07-16)
+
+### Bug 修复
+- 活动管理列表横向滚动 + 查询条件间距调大
+- PackageAudit getPackageList/reviewPackage函数缺失修复; 修复后端reject用params传递reason
+
+
+## v1.0.362 (2026-07-16)
+
+### Bug 修复
+- ActivityReview overflow-x:auto 修复横向滚动
+
+
+## v1.0.361 (2026-07-16)
+
+### Bug 修复
+- showDialog处理object规格+update移除productId避免400
+
+
+## v1.0.360 (2026-07-16)
+
+### Bug 修复
+- approveGuide 中 username 字段为 null 时使用 teacher_{userId} 兜底; fix(web): ArticleAudit 接口名/参数修正 + GuideAudit 分页
+- 创建规划师admin时phone为null导致username为空
+
+
+## v1.0.359 (2026-07-16)
+
+### 文档
+- fix inline extraction for vitamins/barrier/pathogens + add disease risk known names and amino acid merge
+
+### 其他
+- 
+
+
+## v1.0.358 (2026-07-16)
+
+### 新功能
+- 添加营养师审核功能
+
+### 其他
+- AdminController添加营养师审核3端点(applications/approve/reject),
+- ReviewCenterController增加nutritionistPending统计,
+- DatabaseInitializer迁移91,schema.sql同步
+- 前端: NutritionistAudit.vue组件, ReviewCenter.vue添加营养师Tab,
+- admin.js添加营养师审核API函数
+- 
+
+
+## v1.0.357 (2026-07-16)
+
+### 文档
+- add PDF extraction scripts (v4 + v5 with JSON mode)
+
+### 其他
+- 
+
+
+## v1.0.356 (2026-07-16)
+
+### Bug 修复
+- ProductSkuDTO 适配 specs 字段 String→Object 变更
+- sku.getSpecs() 返回非String类型时类型转换保护
+- normalizeSpecsToJson 参数类型改为 Object 适配 specs 字段变更
+- 审核中心10个页面添加横向滚动+filter-bar美化
+- 修复规划师审核列表数据显示问题
+
+### 新功能
+- 添加 api_endpoint/api_key 字段; fix(sku): specs 字段类型改为 Object 支持JSON数组
+
+### 其他
+- 正确处理 res.data.records 映射;优化样式布局
+- 
+
+
+## v1.0.355 (2026-07-16)
+
+### Bug 修复
+- ProductSku create() sku_code NOT NULL 缺失自动生成默认值
+
+### 其他
+- - ProductSkuService.create() 在 skuCode 为 null/空时自动生成:
+-   'SKU-{productId}-{timestamp}'
+- 
+
+
+## v1.0.354 (2026-07-16)
+
+### 新功能
+- 推广/佣金配置控制器 + rebate_commission_config表; fix(promotion): 改用sysConfigService.getValue; feat(schema): 同步rebate_commission_config表
+
+
+## v1.0.353 (2026-07-16)
+
+### 新功能
+- 活动工作流缺失端点 + 电商供应商管理CRUD; feat(schema): 同步ecom_supplier表
+
+### Bug 修复
+- SupplyHierarchy change-requests systemId 改为可选 + ((Number)→Long.valueOf) 解析修复
+
+### 其他
+- - Service.getChangeRequests: 仅在 systemId != null 时加入 where 条件
+- - 全 Controller 20 处 ((Number) ...).longValue() → Long.valueOf(... .toString()) 防 String/Integer 类型解析异常
+- 
+
+
+## v1.0.352 (2026-07-16)
+
+### 测试
+- add unified-audit-center, guide-family-list, and vendor-product-manage E2E tests
+
+
+## v1.0.350 (2026-07-15)
+
+### 新功能
+- 健康打卡 exercise/sleep/water 三个控制器; fix(web): growth-task路径修正
+
+### Bug 修复
+- 修正管理端4个API路径+2个分页兼容
+
+
+## v1.0.349 (2026-07-15)
+
+### Bug 修复
+- ProductAudit 兼容 records 分页格式
+- 修正7个小程序API路径错误(article/supplier/messages/upload/families)
+
+
+## v1.0.348 (2026-07-15)
+
+### 新功能
+- 增强搜索条件和优化样式
+
+### 其他
+- - 新增所属维度筛选(身/心/智/行/富)
+- - 新增审核状态筛选(待审核/已通过/已拒绝)
+- - 优化搜索框占位符文字
+- 样式优化:
+- - 重构 header 布局为 flexbox,支持响应式换行
+- - 统一搜索框和按钮样式
+- - 增加 header-search 类控制搜索框宽度
+- - 优化操作按钮间距和对齐
+- 其他改进:
+- - 默认分页大小从 10 改为 20
+- - 查询按钮显式触发搜索
+- 
+
+
+## v1.0.347 (2026-07-15)
+
+### 其他
+- - 4 Java 文件: entity/EducationSystem, mapper/EducationSystemMapper, service/EducationSystemService, controller/admin/EducationSystemController
+- - Vue 页面: admin/EducationSystems.vue
+- - admin.js: 5 个 education-systems API 封装
+- 顺手清理相关遗留:
+- - DatabaseInitializer:
+-   * 删除 modifyColumnToText('education_systems', 'description') 迁移 (表没了)
+-   * 删除 runMigration92() (整个迁移不入群, 改为 university+education_system 列在 Guide 未被消费)
+- - entity/Guide.java: 删除 university + eduSystem 字段
+-   * 顺带删除 schema.sql 中 guides 表的 university + education_system 列定义
+- - schema.sql: 删除 CREATE TABLE/INSERT FOR education_systems
+- - Layout.vue: 删除教育体系菜单项 + submenu 项
+- - router/index.js: 删除 education-systems 路由
+- 验证: mvn compile 通过, 全项目无 EducationSystem 残留引用
+- 
+
+
+## v1.0.347 (2026-07-15)
+
+### Bug 修复
+- 移除无对应路由的文章审核侧边栏项
+
+### 新功能
+- 统一审核中心 - ReviewCenter.vue + 10子组件 + 后端summary接口
+
+
+## v1.0.344 (2026-07-15)
+
+### Bug 修复
+- 修复 createFamily API 路径错误
+
+### 其他
+- 与后端 FamilyUserController 路径匹配
+- 
+
+### 新功能
+- 添加 family_member_logs 表(家庭成员变更日志)
+- 家庭关系管理系统补齐 (relationship type extension + contact-to-member upgrade + family_member_logs + relation graph shapes)
+
+
+## v1.0.343 (2026-07-15)
+
+### 新功能
+- 新增供应商商品管理功能
+
+### 其他
+- - SupplySystemService 添加 getByAdminId() 方法
+- - SupplySystemController 添加 /my-system 端点
+- - AdminProductController.list() 支持 distributionSystemId 过滤
+- - 新增 SupplierProductController 提供供应商商品 CRUD
+- 前端:
+- - 新增 SupplierProductManage.vue 页面
+- - 新增 supplier product API 函数
+- - 添加路由和侧边栏菜单
+- - ProductEdit.vue 增强供应商管理员支持(自动锁定体系选择)
+- 
+
+
+## v1.0.342 (2026-07-15)
+
+### Bug 修复
+- SupplySettlementService/Controller ((Number)→.toString()) 修复ClassCastException
+
+
+## v1.0.341 (2026-07-15)
+
+### Bug 修复
+- ProductService 添加 getById 方法,SupplierProductController 编译错误
+
+
+## v1.0.340 (2026-07-15)
+
+### Bug 修复
+- SupplySystemController @RequestParam→@RequestBody 修复400错误
+
+
+## v1.0.339 (2026-07-15)
+
+### 新功能
+- 商城营销菜单新增家庭收益和收益提现审核入口
+
+
+## v1.0.338 (2026-07-15)
+
+### Bug 修复
+- schema.sql 同步补充 79 张缺失表的 CREATE TABLE 定义
+
+### 其他
+- - 37 张表: 从 DatabaseInitializer.runMigration* 提取 CREATE TABLE 语句
+- - 42 张表: 从 entity @TableField/pojo 字段反向生成 CREATE TABLE
+- - 验证: 无重复表名, mvn clean compile 通过
+- 
+- - cfc-frontend/utils/api.js: 新增6个家庭收益API函数
+- - cfc-frontend/pages/promotion/index.vue: 重设计(家庭数据卡片+成员贡献榜+管理员面板+孩子只读+支付预留)
+- P4: 管理后台家庭收益管理
+- - cfc-backend: 新增 AdminEarningsController (3个管理端点)
+- - cfc-web/src/api/admin.js: 新增家庭收益管理API
+- - cfc-web/src/router/index.js: 新增两个路由
+- - cfc-web/src/views/admin/FamilyEarnings.vue: 家庭收益列表+详情弹窗
+- - cfc-web/src/views/admin/FamilyEarningsWithdraw.vue: 家庭收益流水查看
+- 
+
+### 新功能
+- 家庭推广体系重构 P3+P4
+
+
+## v1.0.337 (2026-07-15)
+
+### 测试
+- update ISSUE-TRACKING v15 — remote sync analysis + E2E results + pending test additions
+
+### Bug 修复
+- add dimension_weights column to products table (migration 89)
+
+
+## v1.0.336 (2026-07-15)
+
+### 测试
+- fix E2E route paths per pages.json + update ISSUE-TRACKING with v14 findings
+
+
+## v1.0.335 (2026-07-15)
+
+### 新功能
+- 添加家庭天盘功能到心页面
+
+### 其他
+- - 在 pages/mind/index.vue 嵌入家庭天盘模块
+- - 使用火元素配色 (#FF6B9D) 和 Claymorphism 卡片风格
+- - 添加占位数据逻辑,准备对接后端接口
+- - 微信小程序兼容:无可选链、无 CSS Grid、flexbox 布局
+- 
+
+
+## v1.0.334 (2026-07-15)
+
+### 新功能
+- add models field and agnes-2.5-flash model
+
+### 其他
+- - Update SupplySystem entity with models field
+- - Sync schema.sql
+- - Fix duplicate familyId field in CommissionRecord.java
+- - Create Agnes AI supplier with agnes-image-2.0-flash + agnes-2.5-flash
+- 
+
+### Bug 修复
+- DatabaseInitializer 显式声明 Logger 替代 @Slf4j 注解,避免 Lombok 处理异常
+
+
 ## v1.0.333 (2026-07-15)
 
 ### Bug 修复

+ 412 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.333
+> 当前版本: v1.0.374
 
 ## 历史版本
 
@@ -8,6 +8,417 @@
 
 ---
 
+## v1.0.374 (2026-07-16)
+
+### 新功能
+- 首次登录跳过角色选择直接进入信息补充页(默认parent)+ 地址四级选择器
+
+### 其他
+- - user-edit.vue: autoParent 模式下默认 parent,嵌入 AddressPicker 四级地址组件
+- - UpdateUserDTO + UserController + UserService: 扩展 address 字段支持
+- - schema.sql: users 表同步 address 列
+- 
+
+
+## v1.0.373 (2026-07-16)
+
+### 文档
+- add extracted JSON reports for 5 test PDFs
+- refactor to single-PDF-in structured JSON mode + add phylum/disease bacteria tables
+- cleanup old scripts and temporary CSV artifacts
+
+### 其他
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- - PHYLUM_TABLE_TITLES + _parse_phylum_tables() for phylum-level extraction
+- - DISEASE_BACTERIA_TITLES + _parse_disease_bacteria() for obesity/constipation/depression etc.
+- - main() now takes PDF path as arg, outputs same-name .json file
+- - Fallthrough terminator extended, CSV output covers all new table types
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+- Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
+- Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
+- 
+
+
+## v1.0.372 (2026-07-16)
+
+### Bug 修复
+- 修复拖动时按比例分配算法,首维度多分配问题
+
+
+## v1.0.371 (2026-07-16)
+
+### 新功能
+- 营养师/管家小程序入驻申请流程
+
+### 其他
+- - 小程序: 新增 pages/nutritionist/apply 营养师入驻页面
+- - 小程序: 新增 pages/butler/apply 管家入驻页面
+- - pages.json: 注册 nutritionist/butler 两个子包
+- - api.js: 新增 nutritionistApply/nutritionistStatus/butlerApply 函数
+- 
+
+
+## v1.0.370 (2026-07-16)
+
+### Bug 修复
+- ArticleManage分页onPageChange未接收页码参数; 增加每页条数选择器
+
+
+## v1.0.369 (2026-07-16)
+
+### 文档
+- add bacteria composition tables extraction (core genus/probiotics/harmful/pathogens) for triplet format
+
+### 其他
+- 
+
+### 新功能
+- 文章/套餐审核添加详情弹窗、驳回原因显示、批量通过/驳回
+
+
+## v1.0.368 (2026-07-16)
+
+### Bug 修复
+- 活动列表滚动容器统一用overflow:auto消除分页导致的宽度抖动
+
+
+## v1.0.367 (2026-07-16)
+
+### 文档
+- fix JSON triplet whitelist filtering + name/age/gender regex + vitamin B1/B12 overlap bug
+
+### 其他
+- 
+
+
+## v1.0.366 (2026-07-16)
+
+### 文档
+- fix 朱 food table extraction (compressed detection + ref lookup) + regenerate CSV
+
+### 其他
+- 
+
+
+## v1.0.365 (2026-07-16)
+
+### 文档
+- fix neurotransmitter dedup + regenerate all CSV with corrected data
+
+### 其他
+- 
+
+
+## v1.0.364 (2026-07-16)
+
+### 新功能
+- 添加营养师/管家申请API
+
+
+## v1.0.363 (2026-07-16)
+
+### Bug 修复
+- 活动管理列表横向滚动 + 查询条件间距调大
+- PackageAudit getPackageList/reviewPackage函数缺失修复; 修复后端reject用params传递reason
+
+
+## v1.0.362 (2026-07-16)
+
+### Bug 修复
+- ActivityReview overflow-x:auto 修复横向滚动
+
+
+## v1.0.361 (2026-07-16)
+
+### Bug 修复
+- showDialog处理object规格+update移除productId避免400
+
+
+## v1.0.360 (2026-07-16)
+
+### Bug 修复
+- approveGuide 中 username 字段为 null 时使用 teacher_{userId} 兜底; fix(web): ArticleAudit 接口名/参数修正 + GuideAudit 分页
+- 创建规划师admin时phone为null导致username为空
+
+
+## v1.0.359 (2026-07-16)
+
+### 文档
+- fix inline extraction for vitamins/barrier/pathogens + add disease risk known names and amino acid merge
+
+### 其他
+- 
+
+
+## v1.0.358 (2026-07-16)
+
+### 新功能
+- 添加营养师审核功能
+
+### 其他
+- AdminController添加营养师审核3端点(applications/approve/reject),
+- ReviewCenterController增加nutritionistPending统计,
+- DatabaseInitializer迁移91,schema.sql同步
+- 前端: NutritionistAudit.vue组件, ReviewCenter.vue添加营养师Tab,
+- admin.js添加营养师审核API函数
+- 
+
+
+## v1.0.357 (2026-07-16)
+
+### 文档
+- add PDF extraction scripts (v4 + v5 with JSON mode)
+
+### 其他
+- 
+
+
+## v1.0.356 (2026-07-16)
+
+### Bug 修复
+- ProductSkuDTO 适配 specs 字段 String→Object 变更
+- sku.getSpecs() 返回非String类型时类型转换保护
+- normalizeSpecsToJson 参数类型改为 Object 适配 specs 字段变更
+- 审核中心10个页面添加横向滚动+filter-bar美化
+- 修复规划师审核列表数据显示问题
+
+### 新功能
+- 添加 api_endpoint/api_key 字段; fix(sku): specs 字段类型改为 Object 支持JSON数组
+
+### 其他
+- 正确处理 res.data.records 映射;优化样式布局
+- 
+
+
+## v1.0.355 (2026-07-16)
+
+### Bug 修复
+- ProductSku create() sku_code NOT NULL 缺失自动生成默认值
+
+### 其他
+- - ProductSkuService.create() 在 skuCode 为 null/空时自动生成:
+-   'SKU-{productId}-{timestamp}'
+- 
+
+
+## v1.0.354 (2026-07-16)
+
+### 新功能
+- 推广/佣金配置控制器 + rebate_commission_config表; fix(promotion): 改用sysConfigService.getValue; feat(schema): 同步rebate_commission_config表
+
+
+## v1.0.353 (2026-07-16)
+
+### 新功能
+- 活动工作流缺失端点 + 电商供应商管理CRUD; feat(schema): 同步ecom_supplier表
+
+### Bug 修复
+- SupplyHierarchy change-requests systemId 改为可选 + ((Number)→Long.valueOf) 解析修复
+
+### 其他
+- - Service.getChangeRequests: 仅在 systemId != null 时加入 where 条件
+- - 全 Controller 20 处 ((Number) ...).longValue() → Long.valueOf(... .toString()) 防 String/Integer 类型解析异常
+- 
+
+
+## v1.0.352 (2026-07-16)
+
+### 测试
+- add unified-audit-center, guide-family-list, and vendor-product-manage E2E tests
+
+
+## v1.0.350 (2026-07-15)
+
+### 新功能
+- 健康打卡 exercise/sleep/water 三个控制器; fix(web): growth-task路径修正
+
+### Bug 修复
+- 修正管理端4个API路径+2个分页兼容
+
+
+## v1.0.349 (2026-07-15)
+
+### Bug 修复
+- ProductAudit 兼容 records 分页格式
+- 修正7个小程序API路径错误(article/supplier/messages/upload/families)
+
+
+## v1.0.348 (2026-07-15)
+
+### 新功能
+- 增强搜索条件和优化样式
+
+### 其他
+- - 新增所属维度筛选(身/心/智/行/富)
+- - 新增审核状态筛选(待审核/已通过/已拒绝)
+- - 优化搜索框占位符文字
+- 样式优化:
+- - 重构 header 布局为 flexbox,支持响应式换行
+- - 统一搜索框和按钮样式
+- - 增加 header-search 类控制搜索框宽度
+- - 优化操作按钮间距和对齐
+- 其他改进:
+- - 默认分页大小从 10 改为 20
+- - 查询按钮显式触发搜索
+- 
+
+
+## v1.0.347 (2026-07-15)
+
+### 其他
+- - 4 Java 文件: entity/EducationSystem, mapper/EducationSystemMapper, service/EducationSystemService, controller/admin/EducationSystemController
+- - Vue 页面: admin/EducationSystems.vue
+- - admin.js: 5 个 education-systems API 封装
+- 顺手清理相关遗留:
+- - DatabaseInitializer:
+-   * 删除 modifyColumnToText('education_systems', 'description') 迁移 (表没了)
+-   * 删除 runMigration92() (整个迁移不入群, 改为 university+education_system 列在 Guide 未被消费)
+- - entity/Guide.java: 删除 university + eduSystem 字段
+-   * 顺带删除 schema.sql 中 guides 表的 university + education_system 列定义
+- - schema.sql: 删除 CREATE TABLE/INSERT FOR education_systems
+- - Layout.vue: 删除教育体系菜单项 + submenu 项
+- - router/index.js: 删除 education-systems 路由
+- 验证: mvn compile 通过, 全项目无 EducationSystem 残留引用
+- 
+
+
+## v1.0.347 (2026-07-15)
+
+### Bug 修复
+- 移除无对应路由的文章审核侧边栏项
+
+### 新功能
+- 统一审核中心 - ReviewCenter.vue + 10子组件 + 后端summary接口
+
+
+## v1.0.344 (2026-07-15)
+
+### Bug 修复
+- 修复 createFamily API 路径错误
+
+### 其他
+- 与后端 FamilyUserController 路径匹配
+- 
+
+### 新功能
+- 添加 family_member_logs 表(家庭成员变更日志)
+- 家庭关系管理系统补齐 (relationship type extension + contact-to-member upgrade + family_member_logs + relation graph shapes)
+
+
+## v1.0.343 (2026-07-15)
+
+### 新功能
+- 新增供应商商品管理功能
+
+### 其他
+- - SupplySystemService 添加 getByAdminId() 方法
+- - SupplySystemController 添加 /my-system 端点
+- - AdminProductController.list() 支持 distributionSystemId 过滤
+- - 新增 SupplierProductController 提供供应商商品 CRUD
+- 前端:
+- - 新增 SupplierProductManage.vue 页面
+- - 新增 supplier product API 函数
+- - 添加路由和侧边栏菜单
+- - ProductEdit.vue 增强供应商管理员支持(自动锁定体系选择)
+- 
+
+
+## v1.0.342 (2026-07-15)
+
+### Bug 修复
+- SupplySettlementService/Controller ((Number)→.toString()) 修复ClassCastException
+
+
+## v1.0.341 (2026-07-15)
+
+### Bug 修复
+- ProductService 添加 getById 方法,SupplierProductController 编译错误
+
+
+## v1.0.340 (2026-07-15)
+
+### Bug 修复
+- SupplySystemController @RequestParam→@RequestBody 修复400错误
+
+
+## v1.0.339 (2026-07-15)
+
+### 新功能
+- 商城营销菜单新增家庭收益和收益提现审核入口
+
+
+## v1.0.338 (2026-07-15)
+
+### Bug 修复
+- schema.sql 同步补充 79 张缺失表的 CREATE TABLE 定义
+
+### 其他
+- - 37 张表: 从 DatabaseInitializer.runMigration* 提取 CREATE TABLE 语句
+- - 42 张表: 从 entity @TableField/pojo 字段反向生成 CREATE TABLE
+- - 验证: 无重复表名, mvn clean compile 通过
+- 
+- - cfc-frontend/utils/api.js: 新增6个家庭收益API函数
+- - cfc-frontend/pages/promotion/index.vue: 重设计(家庭数据卡片+成员贡献榜+管理员面板+孩子只读+支付预留)
+- P4: 管理后台家庭收益管理
+- - cfc-backend: 新增 AdminEarningsController (3个管理端点)
+- - cfc-web/src/api/admin.js: 新增家庭收益管理API
+- - cfc-web/src/router/index.js: 新增两个路由
+- - cfc-web/src/views/admin/FamilyEarnings.vue: 家庭收益列表+详情弹窗
+- - cfc-web/src/views/admin/FamilyEarningsWithdraw.vue: 家庭收益流水查看
+- 
+
+### 新功能
+- 家庭推广体系重构 P3+P4
+
+
+## v1.0.337 (2026-07-15)
+
+### 测试
+- update ISSUE-TRACKING v15 — remote sync analysis + E2E results + pending test additions
+
+### Bug 修复
+- add dimension_weights column to products table (migration 89)
+
+
+## v1.0.336 (2026-07-15)
+
+### 测试
+- fix E2E route paths per pages.json + update ISSUE-TRACKING with v14 findings
+
+
+## v1.0.335 (2026-07-15)
+
+### 新功能
+- 添加家庭天盘功能到心页面
+
+### 其他
+- - 在 pages/mind/index.vue 嵌入家庭天盘模块
+- - 使用火元素配色 (#FF6B9D) 和 Claymorphism 卡片风格
+- - 添加占位数据逻辑,准备对接后端接口
+- - 微信小程序兼容:无可选链、无 CSS Grid、flexbox 布局
+- 
+
+
+## v1.0.334 (2026-07-15)
+
+### 新功能
+- add models field and agnes-2.5-flash model
+
+### 其他
+- - Update SupplySystem entity with models field
+- - Sync schema.sql
+- - Fix duplicate familyId field in CommissionRecord.java
+- - Create Agnes AI supplier with agnes-image-2.0-flash + agnes-2.5-flash
+- 
+
+### Bug 修复
+- DatabaseInitializer 显式声明 Logger 替代 @Slf4j 注解,避免 Lombok 处理异常
+
+
 ## v1.0.333 (2026-07-15)
 
 ### Bug 修复

+ 117 - 41
cfc-web/src/api/admin.js

@@ -232,7 +232,7 @@ export function getPointsStats() {
 // 获取心愿列表
 export function getWishesList(params) {
   return request({
-    url: '/api/wishes',
+    url: '/api/wishes/list',
     method: 'post',
     data: params
   })
@@ -380,6 +380,40 @@ export function rejectGuide(userId, reason) {
   })
 }
 
+// 获取营养师审核列表
+export function getNutritionistApplications(params) {
+  return request({
+    url: '/api/admin/nutritionist/applications',
+    method: 'post',
+    data: params
+  })
+}
+
+// 通过营养师审核
+export function approveNutritionist(userId) {
+  return request({
+    url: `/api/admin/nutritionist/approve/${userId}`,
+    method: 'post'
+  })
+}
+
+// 拒绝营养师审核
+export function rejectNutritionist(userId, reason) {
+  return request({
+    url: `/api/admin/nutritionist/reject/${userId}`,
+    method: 'post',
+    data: { reason }
+  })
+}
+
+// 获取待审核营养师数量
+export function getPendingNutritionistCount() {
+  return request({
+    url: '/api/admin/nutritionist/pending-count',
+    method: 'post'
+  })
+}
+
 // 获取待审核成长规划师数量
 export function getPendingGuideCount() {
   return request({
@@ -710,46 +744,6 @@ export function updateProductProfitRate(productId, profitRate) {
   })
 }
 
-// ========== 教育体系管理 API ==========
-
-export function getEducationSystems() {
-  return request({
-    url: '/api/admin/education-systems/list',
-    method: 'post'
-  })
-}
-
-export function getAllEducationSystems() {
-  return request({
-    url: '/api/admin/education-systems/all',
-    method: 'post'
-  })
-}
-
-export function createEducationSystem(data) {
-  return request({
-    url: '/api/admin/education-systems/create',
-    method: 'post',
-    data
-  })
-}
-
-export function updateEducationSystem(data) {
-  return request({
-    url: '/api/admin/education-systems/update',
-    method: 'post',
-    data
-  })
-}
-
-export function deleteEducationSystem(id) {
-  return request({
-    url: '/api/admin/education-systems/delete',
-    method: 'post',
-    data: { id }
-  })
-}
-
 // ========== 星座配置管理 API ==========
 
 export function listZodiacConfigs() {
@@ -1113,6 +1107,63 @@ export function changeSupplySystemMemberRole(memberId, role) {
   })
 }
 
+// ========== 供应商产品管理 API (supplier_admin) ==========
+
+export function getMySupplySystem() {
+  return request({
+    url: '/api/admin/supply-system/my-system',
+    method: 'post'
+  })
+}
+
+export function getSupplierProductList(params) {
+  return request({
+    url: '/api/admin/supplier/product/list',
+    method: 'post',
+    data: params
+  })
+}
+
+export function createSupplierProduct(data) {
+  return request({
+    url: '/api/admin/supplier/product/create',
+    method: 'post',
+    data
+  })
+}
+
+export function updateSupplierProduct(data) {
+  return request({
+    url: '/api/admin/supplier/product/update',
+    method: 'post',
+    data
+  })
+}
+
+export function getSupplierProductDetail(id) {
+  return request({
+    url: '/api/admin/supplier/product/detail',
+    method: 'post',
+    data: { productId: id }
+  })
+}
+
+export function deleteSupplierProduct(id) {
+  return request({
+    url: '/api/admin/supplier/product/delete',
+    method: 'post',
+    data: { productId: id }
+  })
+}
+
+export function shelveSupplierProduct(productId, shelve) {
+  return request({
+    url: '/api/admin/supplier/product/shelve',
+    method: 'post',
+    data: { productId, shelve }
+  })
+}
+
 // 结算管理
 export function getSupplySettlementList(params) {
   return request({
@@ -1519,3 +1570,28 @@ export function deleteEcomSupplier(id) {
     data: { id }
   })
 }
+
+// ===== 家庭收益管理 =====
+export function getFamilyEarningsList() {
+  return request({
+    url: '/api/admin/earnings/families',
+    method: 'post',
+    data: {}
+  })
+}
+
+export function getFamilyEarningsDetail(familyId) {
+  return request({
+    url: '/api/admin/earnings/family/' + familyId + '/summary',
+    method: 'post',
+    data: { familyId: familyId }
+  })
+}
+
+export function getFamilyEarningsRecords(familyId, type) {
+  return request({
+    url: '/api/admin/earnings/family/' + familyId + '/records',
+    method: 'post',
+    data: { familyId: familyId, type: type || '' }
+  })
+}

+ 0 - 127
cfc-web/src/api/adminService.js

@@ -1,127 +0,0 @@
-import request from '@/utils/request'
-
-export function getServiceTypes() {
-  return request({
-    url: '/api/admin/service-types',
-    method: 'get'
-  })
-}
-
-export function getAllServiceTypes() {
-  return request({
-    url: '/api/admin/service-types/all',
-    method: 'get'
-  })
-}
-
-export function createServiceType(data) {
-  return request({
-    url: '/api/admin/service-types',
-    method: 'post',
-    data
-  })
-}
-
-export function updateServiceType(id, data) {
-  return request({
-    url: `/api/admin/service-types/${id}`,
-    method: 'put',
-    data
-  })
-}
-
-export function deleteServiceType(id) {
-  return request({
-    url: `/api/admin/service-types/${id}`,
-    method: 'delete'
-  })
-}
-
-export function getServiceContents(params) {
-  return request({
-    url: '/api/admin/service-contents',
-    method: 'get',
-    params
-  })
-}
-
-export function getActiveServiceContents() {
-  return request({
-    url: '/api/admin/service-contents/active',
-    method: 'get'
-  })
-}
-
-export function getServiceContent(id) {
-  return request({
-    url: `/api/admin/service-contents/${id}`,
-    method: 'get'
-  })
-}
-
-export function createServiceContent(data) {
-  return request({
-    url: '/api/admin/service-contents',
-    method: 'post',
-    data
-  })
-}
-
-export function updateServiceContent(id, data) {
-  return request({
-    url: `/api/admin/service-contents/${id}`,
-    method: 'put',
-    data
-  })
-}
-
-export function deleteServiceContent(id) {
-  return request({
-    url: `/api/admin/service-contents/${id}`,
-    method: 'delete'
-  })
-}
-
-export function getPackageTemplatesAdmin() {
-  return request({
-    url: '/api/admin/package-templates',
-    method: 'get'
-  })
-}
-
-export function getAllPackageTemplates() {
-  return request({
-    url: '/api/admin/package-templates/all',
-    method: 'get'
-  })
-}
-
-export function getPackageTemplate(id) {
-  return request({
-    url: `/api/admin/package-templates/${id}`,
-    method: 'get'
-  })
-}
-
-export function createPackageTemplate(data) {
-  return request({
-    url: '/api/admin/package-templates',
-    method: 'post',
-    data
-  })
-}
-
-export function updatePackageTemplate(id, data) {
-  return request({
-    url: `/api/admin/package-templates/${id}`,
-    method: 'put',
-    data
-  })
-}
-
-export function deletePackageTemplate(id) {
-  return request({
-    url: `/api/admin/package-templates/${id}`,
-    method: 'delete'
-  })
-}

+ 3 - 3
cfc-web/src/api/growthTask.js

@@ -1,15 +1,15 @@
 import request from '@/utils/request'
 
 export function getGrowthTaskList(data) {
-  return request({ url: '/api/admin/growth-task/list', method: 'post', data })
+  return request({ url: '/api/growth-task/list', method: 'post', data })
 }
 
 export function updateGrowthTask(id, data) {
-  return request({ url: `/api/admin/growth-task/${id}`, method: 'post', data })
+  return request({ url: `/api/growth-task/${id}`, method: 'post', data })
 }
 
 export function createGrowthTask(data) {
-  return request({ url: '/api/admin/growth-task/create', method: 'post', data })
+  return request({ url: '/api/growth-task/create', method: 'post', data })
 }
 
 export function getOnboardingConfigList() {

+ 2 - 2
cfc-web/src/api/guide.js

@@ -71,7 +71,7 @@ export function rejectApplication(id, adminId, reason) {
 
 export function getAllGuides() {
   return request({
-    url: '/api/admin/guide/guides/list',
+    url: '/api/admin/guide/guides',
     method: 'post'
   })
 }
@@ -85,7 +85,7 @@ export function getGuidesByLevel(level) {
 
 export function getAllPackages() {
   return request({
-    url: '/api/admin/guide/packages/list',
+    url: '/api/admin/guide/packages',
     method: 'post'
   })
 }

+ 24 - 1
cfc-web/src/api/package.js

@@ -11,7 +11,7 @@ export function getPendingPackages() {
 // 获取我的套餐列表
 export function getMyPackages() {
   return request({
-    url: '/api/packages',
+    url: '/api/packages/my',
     method: 'post'
   })
 }
@@ -24,6 +24,29 @@ export function getPackage(id) {
   })
 }
 
+export function getPackageList(params) {
+  return request({
+    url: '/api/admin/packages/pending',
+    method: 'post',
+    data: params
+  })
+}
+
+export function reviewPackage(data) {
+  if (data.action === 'approve') {
+    return request({
+      url: `/api/admin/packages/${data.id}/approve`,
+      method: 'post'
+    })
+  } else {
+    return request({
+      url: `/api/admin/packages/${data.id}/reject`,
+      method: 'post',
+      params: { reason: data.reason }
+    })
+  }
+}
+
 // 审核通过
 export function approvePackage(id) {
   return request({

+ 23 - 40
cfc-web/src/components/DimensionWeightPicker.vue

@@ -91,60 +91,43 @@ export default {
   },
   methods: {
     onWeightChange(changedCode) {
-      // 1. Clamp the changed dimension
       const changed = this.dimensions.find(function(d) { return d.code === changedCode })
       if (changed) {
         changed.currentValue = Math.max(0, Math.min(100, changed.currentValue))
       }
       var remaining = 100 - this.sum
-      if (remaining === 0) {
+      if (Math.abs(remaining) < 0.01) {
         this.emitValue()
         return
       }
       var others = this.dimensions.filter(function(d) { return d.code !== changedCode })
       if (remaining > 0) {
-        // 需要把剩余分配到其他维度
-        var otherTotal = others.reduce(function(s, d) { return s + (d.currentValue || 0) }, 0)
-        if (otherTotal === 0) {
-          // 所有其他维度为 0,平分剩余
-          var rest = remaining
-          others.forEach(function(d, i) {
-            d.currentValue = (i === others.length - 1) ? rest : Math.floor(remaining / others.length)
-            if (i < others.length - 1) rest = remaining - d.currentValue
-          })
-        } else {
-          var distSum = 0
-          others.forEach(function(d, i) {
-            if (i === others.length - 1) {
-              d.currentValue = Math.max(0, remaining - distSum)
-            } else {
-              var share = Math.max(0, Math.round((d.currentValue / otherTotal) * remaining))
-              d.currentValue = share
-              distSum += share
-            }
-          })
+        var othersTotal = others.reduce(function(s, d) { return s + (d.currentValue || 0) }, 0)
+        var exactVals = []
+        for (var i = 0; i < others.length; i++) {
+          exactVals.push(othersTotal > 0 ? ((others[i].currentValue || 0) / othersTotal) * remaining : remaining / others.length)
+        }
+        var distributed = 0
+        for (var j = 0; j < others.length - 1; j++) {
+          var rounded = Math.round(exactVals[j])
+          others[j].currentValue = Math.max(0, rounded)
+          distributed += rounded
         }
+        others[others.length - 1].currentValue = Math.max(0, Math.round(remaining - distributed))
       } else {
-        // 超过 100,需要从其他维度扣除
         var excess = -remaining
-        var otherTotal2 = others.reduce(function(s, d) { return s + (d.currentValue || 0) }, 0)
-        if (otherTotal2 > 0) {
-          var cutSum = 0
-          others.forEach(function(d, i) {
-            if (i === others.length - 1) {
-              d.currentValue = Math.max(0, (d.currentValue || 0) - (excess - cutSum))
-            } else {
-              var cut = Math.min(d.currentValue || 0, Math.round((d.currentValue / otherTotal2) * excess))
-              d.currentValue = Math.max(0, (d.currentValue || 0) - cut)
-              cutSum += cut
-            }
-          })
+        var othersTotal2 = others.reduce(function(s, d) { return s + (d.currentValue || 0) }, 0)
+        var exactCuts = []
+        for (var k = 0; k < others.length; k++) {
+          exactCuts.push(othersTotal2 > 0 ? ((others[k].currentValue || 0) / othersTotal2) * excess : excess / others.length)
         }
-      }
-      // 最后修正浮点误差
-      var finalSum = this.dimensions.reduce(function(s, d) { return s + (d.currentValue || 0) }, 0)
-      if (finalSum !== 100 && others.length > 0) {
-        others[0].currentValue += 100 - finalSum
+        var cutSum = 0
+        for (var m = 0; m < others.length - 1; m++) {
+          var cutRounded = Math.round(exactCuts[m])
+          others[m].currentValue = Math.max(0, (others[m].currentValue || 0) - cutRounded)
+          cutSum += cutRounded
+        }
+        others[others.length - 1].currentValue = Math.max(0, (others[others.length - 1].currentValue || 0) - Math.round(excess - cutSum))
       }
       this.emitValue()
     },

+ 25 - 55
cfc-web/src/router/index.js

@@ -156,16 +156,10 @@ const routes = [
         meta: { title: '用户管理', perm: 'system:users' }
       },
       {
-        path: 'package-audit',
-        name: 'PackageAudit',
-        component: () => import('@/views/PackageAudit.vue'),
-        meta: { title: '套餐审核', perm: 'audit:package' }
-      },
-      {
-        path: 'guide-audit',
-        name: 'GuideAudit',
-        component: () => import('@/views/GuideAudit.vue'),
-        meta: { title: '成长规划师审核', perm: 'audit:guide' }
+        path: 'review-center',
+        name: 'ReviewCenter',
+        component: () => import('@/views/admin/ReviewCenter.vue'),
+        meta: { title: '审核中心', perm: 'audit' }
       },
       {
         path: 'operation-logs',
@@ -174,24 +168,6 @@ const routes = [
         meta: { title: '操作日志', perm: 'system:logs' }
       },
       // 服务管理(管理员)
-      {
-        path: 'service-types',
-        name: 'ServiceTypes',
-        component: () => import('@/views/admin/ServiceTypes.vue'),
-        meta: { title: '服务类型管理', perm: 'system:config' }
-      },
-      {
-        path: 'service-contents',
-        name: 'ServiceContents',
-        component: () => import('@/views/admin/ServiceContents.vue'),
-        meta: { title: '服务内容管理', perm: 'system:config' }
-      },
-      {
-        path: 'package-templates',
-        name: 'PackageTemplates',
-        component: () => import('@/views/admin/PackageTemplates.vue'),
-        meta: { title: '套餐模板管理', perm: 'system:config' }
-      },
       {
         path: 'teacher-messages',
         name: 'TeacherMessages',
@@ -210,18 +186,6 @@ const routes = [
         component: () => import('@/views/admin/Assessment.vue'),
         meta: { title: '测评管理', perm: 'assessment:dan' }
       },
-      {
-        path: 'vendor-review',
-        name: 'VendorReview',
-        component: () => import('@/views/admin/VendorReview.vue'),
-        meta: { title: '服务商审核', perm: 'audit:vendor' }
-      },
-      {
-        path: 'butler-review',
-        name: 'ButlerReview',
-        component: () => import('@/views/admin/ButlerReview.vue'),
-        meta: { title: '管家审核', perm: 'audit:vendor' }
-      },
       {
         path: 'product-manage',
         name: 'ProductManage',
@@ -332,18 +296,6 @@ const routes = [
         component: () => import('@/views/admin/ProductPpointManage.vue'),
         meta: { title: 'P点配置', perm: 'commerce:ppoint' }
       },
-      {
-        path: 'withdraw-audit',
-        name: 'WithdrawAudit',
-        component: () => import('@/views/admin/WithdrawAudit.vue'),
-        meta: { title: '提现审核', perm: 'audit:withdraw' }
-      },
-      {
-        path: 'education-systems',
-        name: 'EducationSystems',
-        component: () => import('@/views/admin/EducationSystems.vue'),
-        meta: { title: '教育体系管理', perm: 'system:education' }
-      },
       {
         path: 'supply-system',
         name: 'SupplySystemList',
@@ -361,9 +313,15 @@ const routes = [
         name: 'SupplySystemDetail',
         component: () => import('@/views/admin/supply-system/Detail.vue'),
         meta: { title: '体系详情', perm: 'system:supply' },
-        props: true
-      },
-        {
+    props: true
+  },
+  {
+    path: 'supplier-products',
+    name: 'SupplierProducts',
+    component: () => import('@/views/admin/SupplierProductManage.vue'),
+    meta: { title: '商品管理', perm: 'commerce:product' }
+  },
+  {
             path: 'supply-system/:id/edit',
             name: 'SupplySystemEdit',
             component: () => import('@/views/admin/supply-system/Form.vue'),
@@ -538,6 +496,18 @@ const routes = [
         component: () => import('@/views/admin/PromotionManagement'),
         meta: { title: '推广管理', perm: 'marketing:promotion' }
       },
+      {
+        path: 'family-earnings',
+        name: 'FamilyEarnings',
+        component: () => import('@/views/admin/FamilyEarnings.vue'),
+        meta: { title: '家庭收益管理', perm: 'marketing:promotion' }
+      },
+      {
+        path: 'family-earnings-withdraw',
+        name: 'FamilyEarningsWithdraw',
+        component: () => import('@/views/admin/FamilyEarningsWithdraw.vue'),
+        meta: { title: '家庭收益提现审核', perm: 'audit:withdraw' }
+      },
       {
         path: 'dimension-config',
         name: 'DimensionConfig',

+ 2 - 2
cfc-web/src/views/Dashboard.vue

@@ -61,7 +61,7 @@
 <!-- 第二行统计卡片 -->
 <el-row :gutter="20" class="stats-row">
   <el-col :span="6">
-    <el-card class="stat-card todo-stat-card" shadow="hover" @click.native="stats.pendingGuideCount > 0 && $router.push('/guide-audit')">
+    <el-card class="stat-card todo-stat-card" shadow="hover" @click.native="stats.pendingGuideCount > 0 && $router.push('/review-center?tab=guide')">
       <div class="stat-icon" :class="stats.pendingGuideCount > 0 ? 'todo-heart' : 'todo-disabled'">
         <i class="el-icon-s-check"></i>
       </div>
@@ -75,7 +75,7 @@
     </el-card>
   </el-col>
   <el-col :span="6">
-    <el-card class="stat-card todo-stat-card" shadow="hover" @click.native="stats.pendingPackageCount > 0 && $router.push('/package-audit')">
+    <el-card class="stat-card todo-stat-card" shadow="hover" @click.native="stats.pendingPackageCount > 0 && $router.push('/review-center?tab=package')">
       <div class="stat-icon" :class="stats.pendingPackageCount > 0 ? 'todo-danger' : 'todo-disabled'">
         <i class="el-icon-s-goods"></i>
       </div>

+ 0 - 225
cfc-web/src/views/GuideAudit.vue

@@ -1,225 +0,0 @@
-<template>
-  <div class="page-container">
-    <el-card>
-      <div slot="header">
-        <span>成长规划师审核</span>
-        <el-button style="float: right" size="small" @click="loadData" :loading="loading">刷新</el-button>
-      </div>
-
-      <el-form :inline="true" :model="searchForm" style="margin-bottom: 20px">
-        <el-form-item label="状态">
-          <el-select v-model="searchForm.status" placeholder="全部" clearable @change="loadData">
-            <el-option label="待审核" value="pending"></el-option>
-            <el-option label="已通过" value="approved"></el-option>
-            <el-option label="已拒绝" value="rejected"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="loadData">搜索</el-button>
-          <el-button @click="handleReset">重置</el-button>
-        </el-form-item>
-        </el-form>
-
-        <div style="overflow:auto;max-height:calc(100vh - 300px);">
-        <el-table :data="tableData" border v-loading="loading" style="max-height:calc(100vh - 300px);">
-        <el-table-column prop="id" label="ID" width="60"></el-table-column>
-        <el-table-column prop="nickname" label="昵称" min-width="100"></el-table-column>
-        <el-table-column prop="realName" label="真实姓名" width="100"></el-table-column>
-        <el-table-column prop="phone" label="手机号" width="120"></el-table-column>
-        <el-table-column prop="idCard" label="身份证号" width="180"></el-table-column>
-        <el-table-column prop="address" label="地址" min-width="160">
-          <template slot-scope="{ row }">{{ row.address || '无' }}</template>
-        </el-table-column>
-        <el-table-column prop="teacherNo" label="证书号" width="120">
-          <template slot-scope="{ row }">{{ row.teacherNo || '无' }}</template>
-        </el-table-column>
-        <el-table-column label="证书/照片" width="120">
-          <template slot-scope="{ row }">
-            <el-button v-if="row.certificateImage" type="text" size="small" @click="previewImage(row.certificateImage)">查看证书</el-button>
-            <span v-else>无</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="teacherStatus" label="状态" width="100">
-          <template slot-scope="{ row }">
-            <el-tag :type="getStatusType(row.teacherStatus)" size="small">{{ getStatusText(row.teacherStatus) }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="updatedAt" label="申请时间" width="160">
-          <template slot-scope="{ row }">{{ formatDate(row.updatedAt) }}</template>
-        </el-table-column>
-        <el-table-column label="操作" width="180" fixed="right">
-          <template slot-scope="{ row }">
-            <el-button v-if="row.teacherStatus === 'pending'" size="mini" type="primary" @click="handleApprove(row)">通过</el-button>
-            <el-dropdown v-if="row.teacherStatus === 'pending'" trigger="hover" @command="(cmd) => handleActionCmd(row, cmd)">
-              <el-button size="mini">
-                更多<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="reject" icon="el-icon-close">拒绝</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-      </el-table-column>
-    </el-table></div>
-
-  <el-pagination
-        v-if="total > 0"
-        style="margin-top: 20px; text-align: right"
-        :current-page="pagination.page"
-        :page-size="pagination.size"
-        :total="total"
-        layout="total, prev, pager, next"
-        @current-change="handlePageChange"
-      />
-    </el-card>
-
-    <el-dialog title="图片预览" :visible.sync="previewVisible" width="500px">
-      <img :src="previewUrl" style="width: 100%" />
-    </el-dialog>
-
-    <el-dialog title="拒绝申请" :visible.sync="rejectDialogVisible" width="400px">
-      <el-form>
-        <el-form-item label="拒绝原因" required>
-          <el-input
-            type="textarea"
-            v-model="rejectForm.reason"
-            :rows="4"
-            placeholder="请输入拒绝原因,申请人将收到此原因"
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="rejectDialogVisible = false">取消</el-button>
-        <el-button type="danger" @click="confirmReject" :loading="rejectLoading">确认拒绝</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getGuideApplications, approveGuide, rejectGuide } from '@/api/admin'
-
-export default {
-  data() {
-    return {
-      loading: false,
-      tableData: [],
-      total: 0,
-      pagination: {
-        page: 1,
-        size: 10
-      },
-      searchForm: {
-        status: 'pending'
-      },
-      previewVisible: false,
-      previewUrl: '',
-      rejectDialogVisible: false,
-      rejectLoading: false,
-      rejectForm: {
-        userId: null,
-        userName: '',
-        reason: ''
-      }
-    }
-  },
-  mounted() {
-    this.loadData()
-  },
-  methods: {
-    handleActionCmd(row, cmd) {
-      switch (cmd) {
-        case 'approve': this.handleApprove(row); break;
-        case 'reject': this.handleReject(row); break;
-      }
-    },
-    async loadData() {
-      this.loading = true
-      try {
-        const params = {
-          page: this.pagination.page,
-          size: this.pagination.size,
-          status: this.searchForm.status || undefined
-        }
-        const res = await getGuideApplications(params)
-        if (res.code === 200) {
-          this.tableData = (res.data && res.data.records) || []
-          this.total = (res.data && res.data.total) || 0
-        }
-      } catch (e) {
-        this.$message.error('加载失败')
-      } finally {
-        this.loading = false
-      }
-    },
-    handleReset() {
-      this.searchForm = { status: 'pending' }
-      this.pagination.page = 1
-      this.loadData()
-    },
-    handlePageChange(page) {
-      this.pagination.page = page
-      this.loadData()
-    },
-    async handleApprove(row) {
-      try {
-        await this.$confirm(`确认通过 "${row.realName || row.nickname}" 的成长规划师申请?`, '提示')
-        const res = await approveGuide(row.id)
-        if (res.code === 200) {
-          this.$message.success('审核通过成功')
-          this.loadData()
-        } else {
-          this.$message.error(res.message || '操作失败')
-        }
-      } catch (e) {
-        if (e !== 'cancel') {
-          this.$message.error('操作失败')
-        }
-      }
-    },
-    async handleReject(row) {
-      this.rejectForm.userId = row.id
-      this.rejectForm.userName = row.realName || row.nickname
-      this.rejectForm.reason = ''
-      this.rejectDialogVisible = true
-    },
-    async confirmReject() {
-      if (!this.rejectForm.reason || !this.rejectForm.reason.trim()) {
-        this.$message.warning('请输入拒绝原因')
-        return
-      }
-      this.rejectLoading = true
-      try {
-        const res = await rejectGuide(this.rejectForm.userId, this.rejectForm.reason)
-        if (res.code === 200) {
-          this.$message.success('已拒绝')
-          this.rejectDialogVisible = false
-          this.loadData()
-        } else {
-          this.$message.error((res.data && res.data.message) || '操作失败')
-        }
-      } catch (e) {
-        this.$message.error('操作失败')
-      } finally {
-        this.rejectLoading = false
-      }
-    },
-    previewImage(url) {
-      this.previewUrl = url
-      this.previewVisible = true
-    },
-    getStatusType(status) {
-      const map = { pending: 'warning', approved: 'success', rejected: 'danger' }
-      return map[status] || 'info'
-    },
-    getStatusText(status) {
-      const map = { pending: '待审核', approved: '已通过', rejected: '已拒绝' }
-      return map[status] || status
-    },
-    formatDate(date) {
-      if (!date) return ''
-      return date.substring(0, 19).replace('T', ' ')
-    }
-  }
-}
-</script>

+ 9 - 20
cfc-web/src/views/Layout.vue

@@ -179,14 +179,8 @@ export default {
           ]},
 
         // ===== 4. 审核中心 (admin) =====
-        { title: '审核中心', icon: 'el-icon-s-check', perm: 'audit',
-          children: [
-            { path: '/package-audit', label: '套餐审核', icon: 'el-icon-document-checked', perm: 'audit:package' },
-            { path: '/guide-audit', label: '规划师审核', icon: 'el-icon-document-checked', perm: 'audit:guide' },
-            { path: '/vendor-review', label: '服务商审核', icon: 'el-icon-document-checked', perm: 'audit:vendor' },
-            { path: '/butler-review', label: '管家审核', icon: 'el-icon-document-checked', perm: 'audit:vendor' },
-            { path: '/withdraw-audit', label: '提现审核', icon: 'el-icon-document-checked', perm: 'audit:withdraw' },
-          ]},
+        { path: '/review-center', label: '审核中心', icon: 'el-icon-s-check', perm: 'audit' },
+
 
         // ===== 5. 商城营销 (admin) =====
         { title: '商城营销', icon: 'el-icon-s-goods', perm: 'commerce',
@@ -197,6 +191,8 @@ export default {
             { path: '/product-profit-rate', label: '产品利润率', icon: 'el-icon-data-line', perm: 'commerce:profit' },
             { path: '/coupon', label: '优惠券管理', icon: 'el-icon-ticket', perm: 'marketing:coupon' },
             { path: '/promotion', label: '推广管理', icon: 'el-icon-s-marketing', perm: 'marketing:promotion' },
+            { path: '/family-earnings', label: '家庭收益', icon: 'el-icon-s-money', perm: 'marketing:promotion' },
+            { path: '/family-earnings-withdraw', label: '收益提现审核', icon: 'el-icon-document-checked', perm: 'audit:withdraw' },
 
           ]},
 
@@ -263,14 +259,6 @@ export default {
               children: [
                 { path: '/dimension-config', label: '维度配置', icon: 'el-icon-data-line', perm: 'system:config' },
                 { path: '/relationship-types', label: '关系类型', icon: 'el-icon-share', perm: 'system:config' },
-                { path: '/service-types', label: '服务类型', icon: 'el-icon-s-management', perm: 'system:config' },
-                { path: '/service-contents', label: '服务内容', icon: 'el-icon-s-management', perm: 'system:config' },
-                { path: '/package-templates', label: '套餐模板', icon: 'el-icon-s-management', perm: 'system:config' },
-              ]},
-            // --- 教育体系 ---
-            { title: '教育体系', icon: 'el-icon-s-management', perm: 'system:education',
-              children: [
-                { path: '/education-systems', label: '教育体系', icon: 'el-icon-s-management', perm: 'system:education' },
               ]},
             // --- 供应商体系 ---
             { title: '供应商体系', icon: 'el-icon-s-management', perm: 'system:supply',
@@ -278,10 +266,11 @@ export default {
                 { path: '/supply-system', label: '供应商体系', icon: 'el-icon-s-management', perm: 'system:supply' },
               ]},
             // --- 供应商管理 (supplier_admin) ---
-            { title: '供应商管理', icon: 'el-icon-s-shop', perm: 'supply:manage',
-              children: [
-                { path: '/supply-manage', label: '供应商管理', icon: 'el-icon-s-shop', perm: 'supply:manage' },
-              ]},
+  { title: '供应商管理', icon: 'el-icon-s-shop', perm: 'supply:manage',
+    children: [
+      { path: '/supply-manage', label: '供应商管理', icon: 'el-icon-s-shop', perm: 'supply:manage' },
+      { path: '/supplier-products', label: '商品管理', icon: 'el-icon-s-goods', perm: 'commerce:product' }
+    ]},
             // --- 健康配置 ---
             { title: '健康配置', icon: 'el-icon-first-aid-kit', perm: 'system:config',
               children: [

+ 0 - 217
cfc-web/src/views/PackageAudit.vue

@@ -1,217 +0,0 @@
-<template>
-  <div class="page-container">
-    <el-card>
-      <div slot="header">
-        <span>套餐审核</span>
-        <el-button style="float: right" size="small" @click="loadData" :loading="loading">刷新</el-button>
-      </div>
-
-      <!-- 筛选 -->
-      <el-form :inline="true" :model="searchForm" style="margin-bottom: 20px">
-        <el-form-item label="状态">
-          <el-select v-model="searchForm.status" placeholder="全部" clearable @change="loadData">
-            <el-option label="待审核" value="pending"></el-option>
-            <el-option label="已通过" value="approved"></el-option>
-            <el-option label="已拒绝" value="rejected"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="loadData">搜索</el-button>
-          <el-button @click="handleReset">重置</el-button>
-        </el-form-item>
-      </el-form>
-
-      <!-- 套餐列表 -->
-      <div style="overflow:auto;max-height:calc(100vh - 300px);">
-<el-table style="max-height:calc(100vh - 300px);" :data="tableData" border v-loading="loading">
-        <el-table-column prop="id" label="ID" width="60"></el-table-column>
-        <el-table-column prop="name" label="套餐名称" min-width="150"></el-table-column>
-        <el-table-column prop="cycleDays" label="周期" width="80">
-          <template slot-scope="{ row }">{{ row.cycleDays }}天</template>
-        </el-table-column>
-        <el-table-column prop="price" label="价格" width="80">
-          <template slot-scope="{ row }">{{ formatPriceWithSymbol(row.price) }}</template>
-        </el-table-column>
-        <el-table-column prop="category" label="分类" width="80"></el-table-column>
-        <el-table-column prop="status" label="状态" width="100">
-          <template slot-scope="{ row }">
-            <el-tag :type="getStatusType(row.status)" size="small">{{ getStatusText(row.status) }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createdAt" label="创建时间" width="160">
-          <template slot-scope="{ row }">{{ formatDate(row.createdAt) }}</template>
-        </el-table-column>
-        <el-table-column label="操作" width="200" fixed="right">
-          <template slot-scope="{ row }">
-            <el-button size="mini" @click="handleView(row)">详情</el-button>
-            <el-dropdown v-if="row.status === 'pending'" trigger="hover" @command="(cmd) => handleActionCmd(row, cmd)">
-              <el-button size="mini">
-                更多<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="approve" icon="el-icon-check">通过</el-dropdown-item>
-                <el-dropdown-item command="reject" icon="el-icon-close">拒绝</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
-      </el-table></div>
-
-      <!-- 分页 -->
-      <el-pagination
-        v-if="total > 0"
-        style="margin-top: 20px; text-align: right"
-        :current-page="pagination.page"
-        :page-size="pagination.size"
-        :total="total"
-        layout="total, prev, pager, next"
-        @current-change="handlePageChange"
-      />
-    </el-card>
-
-    <!-- 详情弹窗 -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="600px">
-      <el-form v-if="currentRow" label-width="100px">
-        <el-form-item label="套餐名称">{{ currentRow.name }}</el-form-item>
-        <el-form-item label="周期">{{ currentRow.cycleDays }}天</el-form-item>
-        <el-form-item label="价格">{{ formatPriceWithSymbol(currentRow.price) }}</el-form-item>
-        <el-form-item label="分类">{{ currentRow.category }}</el-form-item>
-        <el-form-item label="描述">{{ currentRow.description }}</el-form-item>
-        <el-form-item label="状态">
-          <el-tag :type="getStatusType(currentRow.status)">{{ getStatusText(currentRow.status) }}</el-tag>
-        </el-form-item>
-        <el-form-item v-if="currentRow.rejectReason" label="拒绝原因">{{ currentRow.rejectReason }}</el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="dialogVisible = false">关闭</el-button>
-        <el-button v-if="currentRow && currentRow.status === 'pending'" type="primary" @click="handleApprove(currentRow)">通过</el-button>
-        <el-button v-if="currentRow && currentRow.status === 'pending'" type="danger" @click="handleReject(currentRow)">拒绝</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 拒绝原因弹窗 -->
-    <el-dialog title="拒绝原因" :visible.sync="rejectDialogVisible" width="400px">
-      <el-input type="textarea" v-model="rejectReason" rows="4" placeholder="请输入拒绝原因"></el-input>
-      <div slot="footer">
-        <el-button @click="rejectDialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="confirmReject">确定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getPendingPackages, getMyPackages, approvePackage, rejectPackage } from '@/api/package'
-
-export default {
-  name: 'PackageAudit',
-  data() {
-    return {
-      loading: false,
-      tableData: [],
-      total: 0,
-      searchForm: {
-        status: 'pending'
-      },
-      pagination: {
-        page: 1,
-        size: 10
-      },
-      dialogVisible: false,
-      dialogTitle: '套餐详情',
-      currentRow: null,
-      rejectDialogVisible: false,
-      rejectReason: ''
-    }
-  },
-  mounted() {
-    this.loadData()
-  },
-  methods: {
-    handleActionCmd(row, cmd) {
-      switch (cmd) {
-        case 'view': this.handleView(row); break;
-        case 'approve': this.handleApprove(row); break;
-        case 'reject': this.handleReject(row); break;
-      }
-    },
-    async loadData() {
-      this.loading = true
-      try {
-        const res = this.searchForm.status === 'pending' 
-          ? await getPendingPackages()
-          : await getMyPackages()
-        this.tableData = res.data || []
-      } catch (e) {
-        this.$message.error('加载失败')
-      } finally {
-        this.loading = false
-      }
-    },
-    handleReset() {
-      this.searchForm = { status: 'pending' }
-      this.loadData()
-    },
-    handlePageChange(page) {
-      this.pagination.page = page
-      this.loadData()
-    },
-    getStatusType(status) {
-      const map = { pending: 'warning', approved: 'success', rejected: 'danger', draft: 'info' }
-      return map[status] || 'info'
-    },
-    getStatusText(status) {
-      const map = { draft: '草稿', pending: '待审核', approved: '已通过', rejected: '已拒绝', offline: '已下架' }
-      return map[status] || status
-    },
-    formatDate(date) {
-      if (!date) return '-'
-      return new Date(date).toLocaleString()
-    },
-    handleView(row) {
-      this.currentRow = row
-      this.dialogTitle = '套餐详情'
-      this.dialogVisible = true
-    },
-    async handleApprove(row) {
-      try {
-        await this.$confirm('确认审核通过此套餐?', '提示', { type: 'success' })
-        await approvePackage(row.id)
-        this.$message.success('审核通过')
-        this.dialogVisible = false
-        this.loadData()
-      } catch (e) {
-        if (e !== 'cancel') {
-          this.$message.error('操作失败')
-        }
-      }
-    },
-    handleReject(row) {
-      this.currentRow = row
-      this.rejectReason = ''
-      this.rejectDialogVisible = true
-    },
-    async confirmReject() {
-      if (!this.rejectReason.trim()) {
-        this.$message.warning('请输入拒绝原因')
-        return
-      }
-      try {
-        await rejectPackage(this.currentRow.id, this.rejectReason)
-        this.$message.success('已拒绝')
-        this.rejectDialogVisible = false
-        this.dialogVisible = false
-        this.loadData()
-      } catch (e) {
-        this.$message.error('操作失败')
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.page-container {
-  padding: 20px;
-}
-</style>

+ 110 - 26
cfc-web/src/views/admin/Activities.vue

@@ -3,26 +3,62 @@
     <el-card>
       <div slot="header" class="admin-page-header">
         <span class="admin-page-title">活动管理</span>
-        <div>
-          <el-input v-model="keyword" placeholder="搜索..." prefix-icon="el-icon-search" clearable @keyup.enter.native="handleSearch" @clear="handleSearch" />
-          <el-select
-            v-model="filter.status"
-            placeholder="状态筛选"
-            size="mini"
-            clearable
-            @change="loadActivities"
-          >
-            <el-option label="全部状态" value="" />
-            <el-option label="草稿" value="draft" />
-            <el-option label="已发布" value="published" />
-            <el-option label="已结束" value="ended" />
-          </el-select>
-          <el-button type="primary" size="mini" @click="$router.push('/activity-edit')">创建活动</el-button>
-        </div>
+        <el-button type="success" size="mini" icon="el-icon-plus" @click="$router.push('/activity-edit')">创建活动</el-button>
       </div>
-      <div class="table-scroll-wrap-lg">
-        <div style="overflow:auto;max-height:calc(100vh - 300px);">
-        <el-table style="max-height:calc(100vh - 300px);" :data="activities" v-loading="loading" border stripe>
+
+      <div class="filter-bar" style="margin-bottom:12px;gap:12px;">
+        <el-input
+          v-model="keyword"
+          placeholder="搜索活动标题/地点"
+          prefix-icon="el-icon-search"
+          clearable
+          class="header-search"
+          @keyup.enter.native="handleSearch"
+          @clear="handleSearch"
+        />
+        <el-select
+          v-model="filter.status"
+          placeholder="活动状态"
+          clearable
+          @change="loadActivities"
+          style="width:130px;"
+        >
+          <el-option label="全部状态" value="" />
+          <el-option label="草稿" value="draft" />
+          <el-option label="已发布" value="published" />
+          <el-option label="已结束" value="ended" />
+        </el-select>
+        <el-select
+          v-model="filter.dimensionCode"
+          placeholder="所属维度"
+          clearable
+          @change="loadActivities"
+          style="width:120px;"
+        >
+          <el-option label="全部维度" value="" />
+          <el-option label="身" value="body" />
+          <el-option label="心" value="mind" />
+          <el-option label="智" value="wisdom" />
+          <el-option label="行" value="action" />
+          <el-option label="富" value="wealth" />
+        </el-select>
+        <el-select
+          v-model="filter.auditStatus"
+          placeholder="审核状态"
+          clearable
+          @change="loadActivities"
+          style="width:130px;"
+        >
+          <el-option label="全部审核状态" value="" />
+          <el-option label="待审核" value="pending" />
+          <el-option label="已通过" value="approved" />
+          <el-option label="已拒绝" value="rejected" />
+        </el-select>
+        <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+        <el-button size="mini" @click="resetSearch">重置</el-button>
+      </div>
+      <div style="overflow:auto;max-height:calc(100vh - 300px);min-width:0;box-sizing:border-box;">
+        <el-table :data="activities" v-loading="loading" border stripe style="min-width:900px;">
         <el-table-column prop="id" label="ID" width="80" />
         <el-table-column label="封面" width="80">
           <template slot-scope="{ row }">
@@ -74,7 +110,6 @@
           </template>
         </el-table-column>
         </el-table></div>
-      </div>
       <el-pagination
         v-if="total > 0"
         @size-change="handleSizeChange"
@@ -155,8 +190,10 @@ export default {
       keyword: '',
       filter: {
         status: '',
+        dimensionCode: '',
+        auditStatus: '',
         page: 1,
-        size: 10
+        size: 20
       },
       // 报名列表对话框
       regDialogVisible: false,
@@ -191,6 +228,12 @@ export default {
         if (this.filter.status) {
           params.status = this.filter.status
         }
+        if (this.filter.dimensionCode) {
+          params.dimensionCode = this.filter.dimensionCode
+        }
+        if (this.filter.auditStatus) {
+          params.auditStatus = this.filter.auditStatus
+        }
         if (this.keyword) {
           params.keyword = this.keyword
         }
@@ -328,9 +371,50 @@ export default {
 </script>
 
 <style scoped>
-.activities { padding: 20px; flex: 1; display: flex; flex-direction: column; min-height: 0; }
-.activities > .el-card { flex: 1; display: flex; flex-direction: column; min-height: 0; }
-.activities > .el-card >>> .el-card__body { flex: 1; display: flex; flex-direction: column; min-height: 0; overflow-y: auto; }
-.activities >>> .el-table { flex: 1; }
-.activities >>> .el-table__body-wrapper { overflow-y: auto; }
+.activities {
+  padding: 20px;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+.activities > .el-card {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+.activities > .el-card >>> .el-card__body {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  overflow-y: auto;
+}
+.activities >>> .el-table {
+  flex: 1;
+}
+.activities >>> .el-table__body-wrapper {
+  overflow-y: auto;
+}
+.admin-page-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 12px;
+}
+.admin-page-title {
+  font-size: 18px;
+  font-weight: bold;
+}
+.admin-page-actions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+.header-search {
+  width: 220px;
+}
 </style>

+ 41 - 9
cfc-web/src/views/admin/ActivityReview.vue

@@ -1,16 +1,32 @@
 <template>
   <div class="activity-review admin-page">
     <el-card>
-      <div slot="header" class="admin-page-header">
+      <div class="admin-page-header">
         <span class="admin-page-title">活动审核</span>
-        <div class="admin-page-actions">
-          <el-input v-model="keyword" placeholder="搜索活动..." prefix-icon="el-icon-search" clearable @keyup.enter.native="handleSearch" @clear="handleSearch" />
+        <div class="admin-page-actions" style="gap:12px;">
+          <el-input v-model="filter.keyword" placeholder="搜索活动..." prefix-icon="el-icon-search" clearable @keyup.enter.native="handleSearch" @clear="handleSearch" style="width:200px;margin-right:8px;" />
+          <el-select v-model="filter.status" placeholder="活动状态" clearable @change="handleSearch" style="width:130px;">
+            <el-option label="全部状态" value="" />
+            <el-option label="待审核" value="draft" />
+            <el-option label="已发布" value="published" />
+            <el-option label="已结束" value="ended" />
+          </el-select>
+          <el-select v-model="filter.dimensionCode" placeholder="所属维度" clearable @change="handleSearch" style="width:120px;">
+            <el-option label="全部维度" value="" />
+            <el-option label="身" value="body" />
+            <el-option label="心" value="mind" />
+            <el-option label="智" value="wisdom" />
+            <el-option label="行" value="action" />
+            <el-option label="富" value="wealth" />
+          </el-select>
+          <el-button type="primary" size="mini" @click="handleSearch">查询</el-button>
+          <el-button size="mini" @click="resetSearch">重置</el-button>
         </div>
       </div>
-      <div class="table-scroll-wrap-sm">
-      <el-table :data="pendingActivities" v-loading="loading" border stripe>
+      <div style="overflow:auto;max-height:calc(100vh - 300px);min-width:0;box-sizing:border-box;">
+        <el-table :data="pendingActivities" v-loading="loading" border stripe style="min-width:900px;">
       <el-table-column prop="id" label="ID" width="80" />
-      <el-table-column prop="title" label="活动标题" />
+      <el-table-column prop="title" label="活动标题" min-width="200" show-overflow-tooltip />
       <el-table-column prop="applicant" label="申请人" width="120" />
       <el-table-column prop="createdAt" label="申请时间" width="180" />
       <el-table-column label="状态" width="100">
@@ -61,7 +77,11 @@ export default {
     return {
       loading: false,
       pendingActivities: [],
-      keyword: '',
+      filter: {
+        keyword: '',
+        status: '',
+        dimensionCode: ''
+      },
       page: 1,
       size: 20,
       total: 0
@@ -74,8 +94,13 @@ export default {
     async loadPending() {
       this.loading = true
       try {
-        const params = { status: 'draft', page: this.page, size: this.size }
-        if (this.keyword) params.keyword = this.keyword
+        const params = {
+          page: this.page,
+          size: this.size,
+          status: this.filter.status || 'draft',
+          keyword: this.filter.keyword || undefined,
+          dimensionCode: this.filter.dimensionCode || undefined
+        }
         const res = await getActivityList(params)
         this.pendingActivities = (res.data && res.data.records) || []
         this.total = (res.data && res.data.total) || 0
@@ -93,6 +118,13 @@ export default {
       this.page = 1
       this.loadPending()
     },
+    resetSearch() {
+      this.filter.keyword = ''
+      this.filter.status = ''
+      this.filter.dimensionCode = ''
+      this.page = 1
+      this.loadPending()
+    },
     async approve(row) {
       try {
         await reviewActivity({ id: row.id, action: 'publish' })

+ 10 - 3
cfc-web/src/views/admin/ArticleManage.vue

@@ -207,12 +207,13 @@
 
       <div class="pagination-wrap">
         <el-pagination
-          @size-change="onPageChange"
+          @size-change="onSizeChange"
           @current-change="onPageChange"
           :current-page="page"
+          :page-sizes="[10, 20, 50, 100]"
           :page-size="size"
           :total="total"
-          layout="total, prev, pager, next"
+          layout="total, sizes, prev, pager, next"
         />
       </div>
     </el-card>
@@ -335,7 +336,13 @@ export default {
         this.loading = false
       }
     },
-    onPageChange() {
+    onPageChange(page) {
+      this.page = page
+      this.loadList()
+    },
+    onSizeChange(size) {
+      this.size = size
+      this.page = 1
       this.loadList()
     },
     async handlePublishDirect(row) {

+ 0 - 264
cfc-web/src/views/admin/ButlerReview.vue

@@ -1,264 +0,0 @@
-<template>
-  <div class="butler-review admin-page">
-    <el-tabs v-model="activeTab" @tab-click="onTabChange">
-      <el-tab-pane label="管家审核" name="review">
-        <div class="header admin-page-header">
-          <h2 class="admin-page-title">管家审核</h2>
-          <div class="flex items-center gap-sm">
-            <el-select v-model="statusFilter" placeholder="审核状态" @change="loadList">
-              <el-option label="全部状态" value="" />
-              <el-option label="待审核" value="pending" />
-              <el-option label="已通过" value="approved" />
-              <el-option label="已拒绝" value="rejected" />
-            </el-select>
-          </div>
-        </div>
-
-        <div class="table-scroll-wrap">
-          <el-table :data="list" v-loading="loading" border stripe>
-            <el-table-column prop="id" label="档案ID" width="80" />
-            <el-table-column prop="userId" label="用户ID" width="80" />
-            <el-table-column label="管家等级" width="100">
-              <template slot-scope="{ row }">{{ row.tier || '-' }}</template>
-            </el-table-column>
-            <el-table-column label="审核状态" width="100">
-              <template slot-scope="{ row }">
-                <el-tag :type="statusType(row.status)">{{ statusLabel(row.status) }}</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column prop="description" label="申请说明" min-width="200" show-overflow-tooltip />
-            <el-table-column prop="memberCount" label="已服务人数" width="100" />
-            <el-table-column prop="maxMembers" label="上限人数" width="80" />
-            <el-table-column prop="rejectReason" label="拒绝原因" width="150" show-overflow-tooltip />
-            <el-table-column label="操作" width="160" fixed="right">
-              <template slot-scope="{ row }">
-                <template v-if="row.status === 'pending'">
-                  <el-button size="mini" type="success" @click="handleReview(row, 'approve')">通过</el-button>
-                  <el-dropdown trigger="hover" @command="(cmd) => handleActionCmd(row, cmd)">
-                    <el-button size="mini">
-                      更多<i class="el-icon-arrow-down el-icon--right"></i>
-                    </el-button>
-                    <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item command="reject" icon="el-icon-close">拒绝</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </el-dropdown>
-                </template>
-                <span v-else class="no-op">—</span>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-
-        <el-pagination
-          @size-change="onPageChange"
-          @current-change="onPageChange"
-          :current-page="page"
-          :page-size="size"
-          :total="total"
-          layout="total, prev, pager, next"
-          class="pagination-wrap"
-        />
-
-        <el-dialog title="填写拒绝原因" :visible.sync="rejectDialogVisible" width="400px">
-          <el-input v-model="rejectReason" type="textarea" :rows="3" placeholder="请输入拒绝原因" />
-          <span slot="footer">
-            <el-button @click="rejectDialogVisible = false">取消</el-button>
-            <el-button type="danger" @click="confirmReject">确认拒绝</el-button>
-          </span>
-        </el-dialog>
-      </el-tab-pane>
-
-      <el-tab-pane label="服务记录" name="service-records">
-        <div class="header admin-page-header">
-          <h2 class="admin-page-title">管家服务记录</h2>
-        </div>
-        <div class="table-scroll-wrap">
-          <el-table :data="serviceRecords" v-loading="srLoading" border stripe>
-            <el-table-column prop="id" label="记录ID" width="80" />
-            <el-table-column prop="butlerId" label="管家ID" width="80" />
-            <el-table-column prop="memberUserId" label="会员ID" width="80" />
-            <el-table-column label="服务类型" width="120">
-              <template slot-scope="{ row }">{{ serviceTypeLabel(row.serviceType) }}</template>
-            </el-table-column>
-            <el-table-column prop="amountP" label="金额(P点)" width="100" />
-            <el-table-column prop="platformFeeP" label="平台留成" width="100" />
-            <el-table-column prop="butlerAmountP" label="管家所得" width="100" />
-            <el-table-column prop="yearMonth" label="结算年月" width="100" />
-            <el-table-column prop="createdAt" label="创建时间" width="160" />
-          </el-table>
-        </div>
-        <el-pagination
-          @size-change="srPage = $event; loadServiceRecords()"
-          @current-change="srPage = $event; loadServiceRecords()"
-          :current-page="srPage"
-          :page-size="srSize"
-          :total="srTotal"
-          layout="total, prev, pager, next"
-          class="pagination-wrap"
-        />
-      </el-tab-pane>
-
-      <el-tab-pane label="佣金结算" name="settlements">
-        <div class="header admin-page-header">
-          <h2 class="admin-page-title">管家佣金结算</h2>
-        </div>
-        <div class="table-scroll-wrap">
-          <el-table :data="settlements" v-loading="stLoading" border stripe>
-            <el-table-column prop="id" label="结算单ID" width="80" />
-            <el-table-column prop="butlerId" label="管家ID" width="80" />
-            <el-table-column prop="yearMonth" label="结算年月" width="100" />
-            <el-table-column prop="memberCount" label="服务家庭数" width="100" />
-            <el-table-column prop="annualBaseAmountP" label="年费基准" width="100" />
-            <el-table-column prop="totalButlerAmountP" label="管家总所得" width="120" />
-            <el-table-column label="结算状态" width="100">
-              <template slot-scope="{ row }">
-                <el-tag :type="row.status === 'paid' ? 'success' : 'warning'">{{ row.status === 'paid' ? '已结算' : '待结算' }}</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column prop="settledAt" label="结算时间" width="160" />
-          </el-table>
-        </div>
-        <el-pagination
-          @size-change="stPage = $event; loadSettlements()"
-          @current-change="stPage = $event; loadSettlements()"
-          :current-page="stPage"
-          :page-size="stSize"
-          :total="stTotal"
-          layout="total, prev, pager, next"
-          class="pagination-wrap"
-        />
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-import { getButlerList, reviewButler, getButlerServiceRecords, getButlerSettlements } from '@/api/butler'
-
-export default {
-  data() {
-    return {
-      activeTab: 'review',
-      // 审核列表
-      list: [],
-      loading: false,
-      page: 1,
-      size: 20,
-      total: 0,
-      statusFilter: 'pending',
-      rejectDialogVisible: false,
-      rejectTarget: null,
-      rejectReason: '',
-      // 服务记录
-      serviceRecords: [],
-      srLoading: false,
-      srPage: 1,
-      srSize: 20,
-      srTotal: 0,
-      // 结算
-      settlements: [],
-      stLoading: false,
-      stPage: 1,
-      stSize: 20,
-      stTotal: 0
-    }
-  },
-  mounted() {
-    this.loadList()
-  },
-  methods: {
-    statusType(status) {
-      const map = { pending: 'warning', approved: 'success', rejected: 'danger' }
-      return map[status] || 'info'
-    },
-    statusLabel(status) {
-      const map = { pending: '待审核', approved: '已通过', rejected: '已拒绝' }
-      return map[status] || status
-    },
-    serviceTypeLabel(type) {
-      const map = { annual: '年费服务', per_session: '按次服务' }
-      return map[type] || type
-    },
-    onTabChange() {
-      this.page = 1
-      if (this.activeTab === 'review') this.loadList()
-      else if (this.activeTab === 'service-records') this.loadServiceRecords()
-      else if (this.activeTab === 'settlements') this.loadSettlements()
-    },
-    async loadList() {
-      this.loading = true
-      try {
-        const params = { page: this.page, size: this.size, status: this.statusFilter }
-        const res = await getButlerList(params)
-        this.list = res.data.list || []
-        this.total = res.data.total || 0
-      } catch (e) {
-        this.$message.error('加载失败')
-      } finally {
-        this.loading = false
-      }
-    },
-    async loadServiceRecords() {
-      this.srLoading = true
-      try {
-        const res = await getButlerServiceRecords({ page: this.srPage, size: this.srSize })
-        this.serviceRecords = res.data.list || []
-        this.srTotal = res.data.total || 0
-      } catch (e) {
-        this.$message.error('加载失败')
-      } finally {
-        this.srLoading = false
-      }
-    },
-    async loadSettlements() {
-      this.stLoading = true
-      try {
-        const res = await getButlerSettlements({ page: this.stPage, size: this.stSize })
-        this.settlements = res.data.list || []
-        this.stTotal = res.data.total || 0
-      } catch (e) {
-        this.$message.error('加载失败')
-      } finally {
-        this.stLoading = false
-      }
-    },
-    onPageChange(val) {
-      this.page = val
-      this.loadList()
-    },
-    async handleReview(row, action) {
-      try {
-        await reviewButler({ userId: row.userId, action: action, reason: this.rejectReason })
-        this.$message.success('审核完成')
-        this.loadList()
-      } catch (e) {
-        this.$message.error('操作失败')
-      }
-    },
-    showRejectDialog(row) {
-      this.rejectTarget = row
-      this.rejectReason = ''
-      this.rejectDialogVisible = true
-    },
-    handleActionCmd(row, cmd) {
-      switch (cmd) {
-        case 'reject': this.showRejectDialog(row); break
-      }
-    },
-    async confirmReject() {
-      if (!this.rejectReason) {
-        this.$message.warning('请填写拒绝原因')
-        return
-      }
-      await this.handleReview(this.rejectTarget, 'reject')
-      this.rejectDialogVisible = false
-    }
-  }
-}
-</script>
-
-<style scoped>
-.no-op {
-  color: #ccc;
-}
-</style>

+ 0 - 179
cfc-web/src/views/admin/EducationSystems.vue

@@ -1,179 +0,0 @@
-<template>
-  <div class="education-systems admin-page">
-    <el-card>
-      <div slot="header" class="admin-page-header">
-        <span class="admin-page-title">教育体系管理</span>
-        <div class="flex items-center gap-sm">
-          <el-input v-model="keyword" placeholder="搜索体系..." prefix-icon="el-icon-search" clearable @keyup.enter.native="handleSearch" @clear="handleSearch" />
-          <el-button type="primary" size="small" @click="handleCreate">+ 添加体系</el-button>
-        </div>
-      </div>
-      <div class="table-scroll-wrap"><el-table :data="filteredData" stripe>
-        <el-table-column prop="id" label="ID" width="80"></el-table-column>
-        <el-table-column prop="name" label="编码" width="120"></el-table-column>
-        <el-table-column prop="label" label="显示名称"></el-table-column>
-        <el-table-column prop="description" label="描述"></el-table-column>
-        <el-table-column prop="sortOrder" label="排序" width="80"></el-table-column>
-        <el-table-column prop="status" label="状态" width="100">
-          <template slot-scope="scope">
-            <el-tag :type="scope.row.status === 'ACTIVE' ? 'success' : 'danger'">
-              {{ scope.row.status === 'ACTIVE' ? '启用' : '停用' }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="200" fixed="right">
-          <template slot-scope="{ row }">
-            <el-button size="mini" type="primary" @click="handleEdit(row)">编辑</el-button>
-            <el-dropdown trigger="hover" @command="(cmd) => handleActionCmd(row, cmd)">
-              <el-button size="mini">
-                更多<i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="row.status === 'ACTIVE' ? 'disable' : 'enable'" icon="el-icon-switch-button">{{ row.status === 'ACTIVE' ? '停用' : '启用' }}</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
-    </el-table></div>
-  </el-card>
-
-    <el-dialog :visible.sync="dialogVisible" :title="isEdit ? '编辑教育体系' : '添加教育体系'" width="500px">
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="编码">
-          <el-input v-model="form.name" placeholder="如: bachelor"></el-input>
-        </el-form-item>
-        <el-form-item label="显示名称">
-          <el-input v-model="form.label" placeholder="如: 本科"></el-input>
-        </el-form-item>
-        <el-form-item label="描述">
-          <el-input v-model="form.description" type="textarea"></el-input>
-        </el-form-item>
-        <el-form-item label="排序">
-          <el-input-number v-model="form.sortOrder" :min="0"></el-input-number>
-        </el-form-item>
-      </el-form>
-      <div slot="footer">
-        <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="handleSubmit">保存</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog title="操作成功" :visible.sync="successDialogVisible" width="400px" :close-on-click-modal="false">
-      <div style="text-align:center;padding:10px 0">
-        <i class="el-icon-success" style="color:#67C23A;font-size:32px"></i>
-        <p style="margin:12px 0 0;font-size:16px;color:#303133">保存成功</p>
-      </div>
-      <div slot="footer">
-        <el-button type="primary" @click="handleContinue">继续添加</el-button>
-        <el-button @click="handleClose">关闭</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { getAllEducationSystems, createEducationSystem, updateEducationSystem } from '@/api/admin'
-
-export default {
-  name: 'EducationSystems',
-  data() {
-    return {
-      systems: [],
-      keyword: '',
-      dialogVisible: false,
-      successDialogVisible: false,
-      isEdit: false,
-      form: {
-        id: null,
-        name: '',
-        label: '',
-        description: '',
-        sortOrder: 0,
-        status: 'ACTIVE'
-      }
-    }
-  },
-  computed: {
-    filteredData() {
-      if (!this.keyword) return this.systems
-      const kw = this.keyword.toLowerCase()
-      return this.systems.filter(item => item.name?.toLowerCase().includes(kw) || item.label?.toLowerCase().includes(kw))
-    }
-  },
-  created() {
-    this.loadData()
-  },
-  methods: {
-    async loadData() {
-      try {
-        const res = await getAllEducationSystems()
-        if (res.data) {
-          this.systems = res.data
-        }
-      } catch (e) {
-        console.error(e)
-      }
-    },
-    handleCreate() {
-      this.isEdit = false
-      this.form = { id: null, name: '', label: '', description: '', sortOrder: 0, status: 'ACTIVE' }
-      this.dialogVisible = true
-    },
-    handleEdit(row) {
-      this.isEdit = true
-      this.form = { ...row }
-      this.dialogVisible = true
-    },
-    async toggleStatus(row) {
-      row.status = row.status === 'ACTIVE' ? 'DISABLED' : 'ACTIVE'
-      try {
-        await updateEducationSystem(row)
-        this.$message.success('状态已更新')
-      } catch (e) {
-        row.status = row.status === 'ACTIVE' ? 'DISABLED' : 'ACTIVE'
-        this.$message.error('更新失败')
-      }
-    },
-    async handleSubmit() {
-      try {
-        if (this.isEdit) {
-          await updateEducationSystem(this.form)
-        } else {
-          await createEducationSystem(this.form)
-        }
-        this.$message.success('保存成功')
-        this.successDialogVisible = true
-      } catch (e) {
-        this.$message.error('保存失败')
-      }
-    },
-    handleSearch() {},
-    handleActionCmd(row, cmd) {
-      switch (cmd) {
-        case 'disable':
-          row.status = 'DISABLED'
-          this.toggleStatus(row)
-          break
-        case 'enable':
-          row.status = 'ACTIVE'
-          this.toggleStatus(row)
-          break
-      }
-    },
-    handleContinue() {
-      this.successDialogVisible = false
-      this.isEdit = false
-      this.form = { id: null, name: '', label: '', description: '', sortOrder: 0, status: 'ACTIVE' }
-      this.dialogVisible = true
-    },
-    handleClose() {
-      this.successDialogVisible = false
-      this.dialogVisible = false
-      this.loadData()
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>

+ 163 - 0
cfc-web/src/views/admin/FamilyEarnings.vue

@@ -0,0 +1,163 @@
+<template>
+  <div class="family-earnings admin-page">
+    <div class="header admin-page-header">
+      <h2 class="admin-page-title">家庭收益管理</h2>
+      <div class="flex items-center gap-sm">
+        <el-input v-model="searchKeyword" placeholder="搜索家庭ID..." prefix-icon="el-icon-search" style="width:200px" clearable @keyup.enter.native="loadList" @clear="loadList" />
+        <el-button type="primary" @click="loadList">刷新</el-button>
+      </div>
+    </div>
+
+    <div class="table-scroll-wrap">
+      <el-table :data="list" v-loading="loading" border stripe @row-click="showDetail">
+        <el-table-column prop="id" label="ID" width="70" />
+        <el-table-column prop="familyId" label="家庭ID" width="100" />
+        <el-table-column label="累计推荐收入" width="140">
+          <template slot-scope="{ row }">
+            <span class="amount-orange">{{ fenToYuan(row.totalEarned) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="可支配余额" width="140">
+          <template slot-scope="{ row }">
+            <span class="amount-green">{{ fenToYuan(row.availableAmount) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="已提现" width="120">
+          <template slot-scope="{ row }">
+            {{ fenToYuan(row.withdrawnAmount) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="已分配" width="120">
+          <template slot-scope="{ row }">
+            {{ fenToYuan(row.distributedAmount) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="更新时间" width="160">
+          <template slot-scope="{ row }">
+            {{ row.updatedAt ? formatTime(row.updatedAt) : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100" fixed="right">
+          <template slot-scope="{ row }">
+            <el-button size="mini" type="primary" @click.stop="showDetail(row)">详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 家庭收益详情弹窗 -->
+    <el-dialog title="家庭收益详情" :visible.sync="detailVisible" width="700px" top="5vh">
+      <div v-loading="detailLoading">
+        <el-descriptions :column="2" border v-if="detail">
+          <el-descriptions-item label="家庭ID">{{ detail.familyId || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="累计推荐收入">
+            <span class="amount-orange">{{ fenToYuan(detail.totalEarned) }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="可支配余额">
+            <span class="amount-green">{{ fenToYuan(detail.availableAmount) }}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="已提现">{{ fenToYuan(detail.withdrawnAmount) }}</el-descriptions-item>
+          <el-descriptions-item label="已分配">{{ fenToYuan(detail.distributedAmount) }}</el-descriptions-item>
+        </el-descriptions>
+
+        <h4 style="margin:20px 0 10px">成员贡献</h4>
+        <el-table :data="detail.members || []" border stripe size="small" v-if="detail && detail.members && detail.members.length > 0">
+          <el-table-column label="用户ID" prop="userId" width="80" />
+          <el-table-column label="昵称" prop="nickname" min-width="120" />
+          <el-table-column label="已分配" width="120">
+            <template slot-scope="{ row }">{{ fenToYuan(row.allocatedAmount) }}</template>
+          </el-table-column>
+          <el-table-column label="已消费" width="120">
+            <template slot-scope="{ row }">{{ fenToYuan(row.consumedAmount) }}</template>
+          </el-table-column>
+          <el-table-column label="可用余额" width="120">
+            <template slot-scope="{ row }"><span class="amount-green">{{ fenToYuan(row.availableAmount) }}</span></template>
+          </el-table-column>
+          <el-table-column label="池权限" width="100">
+            <template slot-scope="{ row }">
+              <el-tag :type="row.canUseFamilyBalance ? 'success' : 'info'" size="mini">
+                {{ row.canUseFamilyBalance ? '可用' : '关闭' }}
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="管理员" width="80">
+            <template slot-scope="{ row }">
+              <el-tag v-if="row.isAdmin" type="warning" size="mini">是</el-tag>
+              <span v-else>否</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getFamilyEarningsList, getFamilyEarningsDetail } from '@/api/admin'
+
+export default {
+  data() {
+    return {
+      list: [],
+      loading: false,
+      searchKeyword: '',
+      detailVisible: false,
+      detailLoading: false,
+      detail: null
+    }
+  },
+  mounted() {
+    this.loadList()
+  },
+  methods: {
+    async loadList() {
+      this.loading = true
+      try {
+        var res = await getFamilyEarningsList()
+        this.list = res.data || []
+      } catch (e) {
+        this.$message.error('加载失败')
+      } finally {
+        this.loading = false
+      }
+    },
+    async showDetail(row) {
+      this.detailVisible = true
+      this.detailLoading = true
+      try {
+        var res = await getFamilyEarningsDetail(row.familyId || row.id)
+        this.detail = res.data || row
+      } catch (e) {
+        this.$message.error('加载详情失败')
+        this.detail = row
+      } finally {
+        this.detailLoading = false
+      }
+    },
+    fenToYuan(fen) {
+      if (fen === null || fen === undefined) return '0.00'
+      var num = Number(fen)
+      if (isNaN(num)) return '0.00'
+      return (num / 100).toFixed(2)
+    },
+    formatTime(t) {
+      if (!t) return '-'
+      return t.replace ? t.replace('T', ' ').substring(0, 19) : String(t)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.family-earnings {
+  padding: 20px;
+}
+.amount-orange {
+  font-weight: bold;
+  color: #e6a23c;
+}
+.amount-green {
+  font-weight: bold;
+  color: #67c23a;
+}
+</style>

+ 125 - 0
cfc-web/src/views/admin/FamilyEarningsWithdraw.vue

@@ -0,0 +1,125 @@
+<template>
+  <div class="family-earnings-withdraw admin-page">
+    <div class="header admin-page-header">
+      <h2 class="admin-page-title">家庭收益提现审核</h2>
+      <div class="flex items-center gap-sm">
+        <el-select v-model="typeFilter" placeholder="类型" @change="loadList" style="width:120px">
+          <el-option label="全部" value="" />
+          <el-option label="提现" value="withdraw" />
+          <el-option label="分配" value="distribute" />
+          <el-option label="消费" value="consume" />
+          <el-option label="收入" value="earn" />
+        </el-select>
+        <el-button type="primary" @click="loadList">刷新</el-button>
+      </div>
+    </div>
+
+    <div class="table-scroll-wrap">
+      <el-table :data="list" v-loading="loading" border stripe>
+        <el-table-column prop="id" label="ID" width="70" />
+        <el-table-column prop="familyId" label="家庭ID" width="90" />
+        <el-table-column label="类型" width="100">
+          <template slot-scope="{ row }">
+            <el-tag :type="typeTag(row.type)" size="mini">{{ typeLabel(row.type) }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="金额" width="120">
+          <template slot-scope="{ row }">
+            <span :class="row.amount > 0 ? 'amount-out' : 'amount-in'">{{ row.amount > 0 ? '-' : '+' }}{{ fenToYuan(row.amount) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作人" width="120">
+          <template slot-scope="{ row }">
+            {{ row.fromUserId || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" width="160">
+          <template slot-scope="{ row }">
+            {{ row.createdAt ? formatTime(row.createdAt) : '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <el-pagination
+      @current-change="onPageChange"
+      :current-page="page"
+      :page-size="size"
+      :total="total"
+      layout="total, prev, pager, next"
+      class="pagination-wrap"
+    />
+  </div>
+</template>
+
+<script>
+import { getFamilyEarningsRecords } from '@/api/admin'
+
+export default {
+  data() {
+    return {
+      list: [],
+      loading: false,
+      page: 1,
+      size: 20,
+      total: 0,
+      typeFilter: ''
+    }
+  },
+  mounted() {
+    this.loadList()
+  },
+  methods: {
+    async loadList() {
+      this.loading = true
+      try {
+        var res = await getFamilyEarningsRecords(0, this.typeFilter)
+        if (res.data) {
+          this.list = Array.isArray(res.data) ? res.data : [res.data]
+          this.total = this.list.length
+        }
+      } catch (e) {
+        this.$message.error('加载失败')
+      } finally {
+        this.loading = false
+      }
+    },
+    onPageChange(val) {
+      this.page = val
+      this.loadList()
+    },
+    typeTag(type) {
+      var map = { earn: 'success', withdraw: 'danger', distribute: 'warning', consume: 'info' }
+      return map[type] || 'info'
+    },
+    typeLabel(type) {
+      var map = { earn: '收入', withdraw: '提现', distribute: '分配', consume: '消费' }
+      return map[type] || type
+    },
+    fenToYuan(fen) {
+      if (fen === null || fen === undefined) return '0.00'
+      var num = Number(fen)
+      if (isNaN(num)) return '0.00'
+      return Math.abs(num / 100).toFixed(2)
+    },
+    formatTime(t) {
+      if (!t) return '-'
+      return t.replace ? t.replace('T', ' ').substring(0, 19) : String(t)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.family-earnings-withdraw {
+  padding: 20px;
+}
+.amount-out {
+  font-weight: bold;
+  color: #f56c6c;
+}
+.amount-in {
+  font-weight: bold;
+  color: #67c23a;
+}
+</style>

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini