Переглянути джерело

feat(cfc-backend): 孩子端契约差距补齐 — G-01/C-10 勋章解锁通知、G-02/C-16 受限资料投影、G-04/C-18 账号绑定校验 (EVD-9)

- BadgeService.grantBadge 授予后经 NotificationDispatchService 写 user_notification(type=badge_unlock,五通道分发),接收人优先成员关联可登录账号,local 成员回退同家庭可登录用户
- UserService.getProfileView 受限投影,role=child 裁剪 idCard/phone/realName/openid;/api/user/info、/api/auth/info、/api/family/user/info 统一走
- AuthController 新增 POST /api/auth/account/bind-verify 账号绑定校验(不新增表/迁移);设备维度待产品确认
- 同步 docs/superpowers/specs/2026-11-07-child-zone-contract.md 与 PROJECT-OVERVIEW.md
Sisyphus 1 тиждень тому
батько
коміт
360ce46902

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

@@ -81,10 +81,7 @@ public class UserController {
     @Operation(summary = "获取用户信息")
     public Result<User> getUserInfo(HttpServletRequest request) {
         Long userId = (Long) request.getAttribute("userId");
-        User user = userService.getUserInfo(userId);
-        if (user != null) {
-            user.setPassword(null);
-        }
+        User user = userService.getProfileView(userId);
         return Result.success(user);
     }
 

+ 51 - 4
cfc-backend/src/main/java/com/etotem/cfc/controller/auth/AuthController.java

@@ -6,6 +6,8 @@ import com.etotem.cfc.dto.*;
 import com.etotem.cfc.dto.RegisterWithIdCardDTO;
 import com.etotem.cfc.dto.RegisterWithInviteCodeDTO;
 import com.etotem.cfc.entity.User;
+import com.etotem.cfc.entity.FamilyMember;
+import com.etotem.cfc.mapper.FamilyMemberMapper;
 import com.etotem.cfc.mapper.UserMapper;
 import com.etotem.cfc.service.SsoService;
 import com.etotem.cfc.service.UserService;
@@ -40,6 +42,9 @@ public class AuthController {
     @Resource
     private UserMapper userMapper;
 
+    @Resource
+    private FamilyMemberMapper familyMemberMapper;
+
     @Resource
     private SsoService ssoService;
 
@@ -188,10 +193,7 @@ public class AuthController {
         if (userId == null) {
             return Result.error("未登录");
         }
-        User user = userService.getUserInfo(userId);
-        if (user != null) {
-            user.setPassword(null);
-        }
+        User user = userService.getProfileView(userId);
         return Result.success(user);
     }
 
@@ -255,6 +257,51 @@ public class AuthController {
         return Result.success(valid);
     }
 
+    /**
+     * 账号绑定校验(C-18,账号绑定口径,见 specs G-04):
+     * 校验当前登录账号与其家庭/成员的绑定关系。
+     * - 不传 memberId:校验登录账号已绑定家庭(familyId 非空)
+     * - 传 memberId:额外校验该成员属于当前账号所在家庭
+     */
+    @Operation(summary = "账号绑定校验(成员归属)")
+    @PostMapping("/account/bind-verify")
+    public Result<Map<String, Object>> accountBindVerify(@RequestAttribute("userId") Long userId,
+                                                          @RequestBody(required = false) Map<String, Object> body) {
+        if (userId == null || userId <= 0) {
+            return Result.error("未登录");
+        }
+        User user = userMapper.selectById(userId);
+        if (user == null) {
+            return Result.error("用户不存在");
+        }
+        Map<String, Object> data = new HashMap<>();
+        data.put("bound", Boolean.TRUE);
+        data.put("userId", userId);
+        data.put("familyId", user.getFamilyId());
+        if (user.getFamilyId() == null) {
+            data.put("bound", Boolean.FALSE);
+            data.put("reason", "账号未绑定家庭");
+            return Result.success(data);
+        }
+        Object memberIdObj = body != null ? body.get("memberId") : null;
+        if (memberIdObj != null) {
+            Long memberId;
+            try {
+                memberId = Long.valueOf(String.valueOf(memberIdObj));
+            } catch (NumberFormatException e) {
+                return Result.error("memberId 格式不正确");
+            }
+            FamilyMember member = familyMemberMapper.selectById(memberId);
+            if (member == null || !user.getFamilyId().equals(member.getFamilyId())) {
+                data.put("bound", Boolean.FALSE);
+                data.put("reason", "登录账号与该成员无绑定关系");
+                return Result.success(data);
+            }
+            data.put("memberId", memberId);
+        }
+        return Result.success(data);
+    }
+
     /**
      * 检查手机号是否已注册(测试环境用)
      */

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/family/FamilyUserController.java

@@ -47,7 +47,7 @@ public class FamilyUserController {
     @Operation(summary = "获取用户信息")
     @PostMapping("/info")
     public Result<User> getUserInfo(@RequestAttribute("userId") Long userId) {
-        User user = userService.getUserInfo(userId);
+        User user = userService.getProfileView(userId);
         return Result.success(user);
     }
 

+ 56 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/BadgeService.java

@@ -2,9 +2,13 @@ package com.etotem.cfc.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.etotem.cfc.entity.Badge;
+import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.entity.MemberBadge;
+import com.etotem.cfc.entity.User;
 import com.etotem.cfc.mapper.BadgeMapper;
+import com.etotem.cfc.mapper.FamilyMemberMapper;
 import com.etotem.cfc.mapper.MemberBadgeMapper;
+import com.etotem.cfc.mapper.UserMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +29,15 @@ public class BadgeService {
     @Resource
     private MemberBadgeMapper memberBadgeMapper;
 
+    @Resource
+    private FamilyMemberMapper familyMemberMapper;
+
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private NotificationDispatchService notificationDispatchService;
+
     // ===== 勋章定义管理 =====
 
     public List<Badge> getAllBadges() {
@@ -101,6 +114,49 @@ public class BadgeService {
         }
 
         memberBadgeMapper.insert(cb);
+        
+        // G-01(C-10) 勋章解锁站内提醒 —— 授予后写 user_notifications(type=badge_unlock)走通知分发服务
+        notifyBadgeUnlock(memberId, badge);
+    }
+
+    // G-01(C-10) 解锁提醒:授予后写站内通知(badge_unlock),经 NotificationDispatchService 五通道分发。
+    private void notifyBadgeUnlock(Long memberId, Badge badge) {
+        try {
+            Long recipientUserId = resolveNotifyUserId(memberId);
+            if (recipientUserId == null) {
+                log.warn("勋章解锁通知跳过: memberId={}, badgeId={}, 无可用接收账号", memberId, badge.getId());
+                return;
+            }
+            Map<String, Object> vars = new HashMap<>();
+            vars.put("badgeName", badge.getName());
+            notificationDispatchService.sendByTemplate("badge_unlock", recipientUserId, vars,
+                    "badge", badge.getId(),
+                    "勋章解锁",
+                    "恭喜解锁新勋章「" + badge.getName() + "」!");
+        } catch (Exception e) {
+            log.warn("勋章解锁通知发送失败: memberId={}, badgeId={}, error={}", memberId, badge.getId(), e.getMessage());
+        }
+    }
+
+    private Long resolveNotifyUserId(Long memberId) {
+        FamilyMember member = familyMemberMapper.selectById(memberId);
+        if (member == null) {
+            return null;
+        }
+        if (member.getUserId() != null) {
+            User u = userMapper.selectById(member.getUserId());
+            if (u != null && u.getOpenid() != null && !u.getOpenid().isEmpty()) {
+                return u.getId();
+            }
+        }
+        List<User> loginUsers = userMapper.selectList(
+                new LambdaQueryWrapper<User>()
+                        .eq(User::getFamilyId, member.getFamilyId())
+                        .isNotNull(User::getOpenid)
+                        .ne(User::getOpenid, "")
+                        .orderByDesc(User::getIsFamilyAdmin)
+                        .last("LIMIT 1"));
+        return (loginUsers != null && !loginUsers.isEmpty()) ? loginUsers.get(0).getId() : null;
     }
 
     // ===== 家庭成员勋章查询 =====

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

@@ -402,7 +402,24 @@ private FamilyInvitationService familyInvitationService;
         return userMapper.selectById(userId);
     }
 
-    /** 回写字段白名单(user 目标) */
+    /**
+     * 受限资料投影(C-16):角色为 child 时裁剪敏感字段(idCard/phone/realName/openid)。
+     * 见 docs/superpowers/specs/2026-11-07-child-zone-contract.md G-02。
+     */
+    public User getProfileView(Long userId) {
+        User user = userMapper.selectById(userId);
+        if (user == null) {
+            return null;
+        }
+        user.setPassword(null);
+        if ("child".equals(user.getRole())) {
+            user.setIdCard(null);
+            user.setPhone(null);
+            user.setRealName(null);
+            user.setOpenid(null);
+        }
+        return user;
+    }
     private static final String[] USER_BACKFILL_WHITELIST = {"phone", "gender", "birthday", "birthHour", "dietPreferences", "address", "realName"};
 
     /** 回写字段白名单(member 目标,family_members 表无 dietPreferences/address 列) */

+ 1 - 0
docs/superpowers/PROJECT-OVERVIEW.md

@@ -232,6 +232,7 @@
 | **CF 值体系统一 · F-6 存量迁移**(2026-10-24):迁移417 将 `family_platform_balance`、`family_members.system_points`、`user_platform_balance` 一次性幂等迁入成员维度 `cf_balance`;三类 `migration_*` 流水守卫重复执行,旧表保留只读历史 | `plans/2026-10-24-cf-value-unification-plan.md` §六 + `api/API_REFERENCE.md` 6.4 |
 | **CF 值体系统一 · F-4 分佣收口 + F03a/F03b 发放接入**(2026-10-25):推荐人返佣收口为两级销售奖(F03a 按团队 8 层内滚动一年累计 P 点档位上限 70% / F03b 按自身滚动一年消费 P 点档位上限 20%),共同基数 = 本单消费 P 点;迁移418 补两级档位种子 + `dedup_ref_type` 对齐为 F03a/F03b,迁移420 新建 `ppoint_consumption_log`(滚动一年聚合数据源,唯一键 `order_type+order_id`;419 已被 `membership_levels.max_daily_analyze` 占用);发放统一走 F-2 `earnByRule` 只写 `cf_balance` + `cf_balance_log`;与 F-3a 共存(当前消费人 F02 + 推荐人 F03a/F03b 都走统一账本,`cf_transfer_record` 不再由分佣服务写入);`CommissionDistService.distribute` 写接口 410 Gone、`commission_dist_log` 转只读;`/api/commission/cf/rate` 扩展两级档位字段 | `plans/2026-10-24-cf-value-unification-plan.md` §四/§3.1/§4.2/§4.4 + `api/API_REFERENCE.md` 4.33 + 6.5 |
 | **CF 值体系统一 · F-8 清理收尾**(2026-10-25):三套旧账本写接口 410 Gone(`PointsService` awardCfPoints/awardCheckinPoints/deductForWishCf/deductCfPoints/checkAndGrantCfReward;`PlatformPointsService` getOrCreate/earn/spend/freeze/unfreeze/confirmWithdraw;`FamilyPlatformPointsService` getOrCreate/earn/spend/freeze/unfreeze/confirmWithdraw/adjust;`adjustPoints` 保留为活跃 F19 适配层,`exchangeCouponByCf`/`refundCouponCf` 保留);清理 `system_points`「CF值」误导性注释与 F-3b1「待 Q1 确认」注释(F10 已定:每个完成成员各发一次);新增《CF 值获取/消耗单一事实源》规范文档;核销 W0.2「product_config 下线」;未新增 DB 迁移 | `specs/2026-10-25-cf-value-single-source-of-truth.md` + `plans/2026-10-24-cf-value-unification-plan.md` §七 F-8 |
+| **孩子端(不能登录用户视角)契约核对(EVD-9,2026-11-07)**:26 个 SC 端点核验(26/26 有承载、19/26 完整闭环)+ 7 场景缺口(G-01~G-07)+ 5 跨切面(G-08~G-12);2026-11-07 补齐 G-01/C-10 勋章解锁通知(grantBadge 授予后写 user_notification,type=badge_unlock 五通道分发)、G-02/C-16 受限资料投影(UserService.getProfileView,role=child 裁剪 idCard/phone/realName/openid,三个 info 端点统一走)、G-04/C-18 账号绑定校验(新增 `POST /api/auth/account/bind-verify`,账号绑定口径,不新增表;设备维度待产品确认) | `specs/2026-11-07-child-zone-contract.md` |
 
 ---
 

+ 9 - 9
docs/superpowers/specs/2026-11-07-child-zone-contract.md

@@ -98,8 +98,8 @@ EVD-9 启动时,`docs/tdd/orchestration/child-zone-kickoff-20261107.md` 在 `o
 | 勋章墙(C-09) | `/list`(启用定义)+ `/member/list`(已得,收藏优先+获得时间倒序)+ `/statistics/member` + `/ranking/family` + `/detail` + `/favorite` → **可支撑** |
 | 授予链路 | 仅 `POST /api/badges/grant`(人工);**无任务/打卡自动聚合授予** |
 | 判重 | `grantBadge` 先查 `(memberId,badgeId)`,存在即 return ✅ |
-| 解锁提醒(C-10) | **未实现**:`grantBadge` 只写 `member_badges`,不写 `user_notification`、无推送;`/api/notification/*` 只负责读 |
-| 结论 | C-09 墙成立;C-10 只完成"解锁","提醒/推送"缺失(G-01) |
+| 解锁提醒(C-10) | **已实现(G-01)**:`grantBadge` 授予后经 `NotificationDispatchService` 写 `user_notification`(type=badge_unlock,五通道分发),接收人优先成员关联可登录账号,local 成员回退同家庭可登录用户;`/api/notification/*` 负责读 |
+| 结论 | C-09 墙成立;C-10 "解锁+提醒"已闭环(G-01 于 2026-11-07 补齐) |
 
 ### 3.3 SC-C-18 绑定校验
 
@@ -108,7 +108,7 @@ EVD-9 启动时,`docs/tdd/orchestration/child-zone-kickoff-20261107.md` 在 `o
 | 场景要求 | "登录设备校验;异常设备二次验证"(模块 `AuthController`) |
 | 实测 | `AuthController` 全部端点无 `deviceId`/设备表/登录设备比对;`JwtInterceptor` 只校验 token 与用户存在性 |
 | 易混淆 | `/api/bind/*`=家庭-规划师绑定;`/api/family/invite/*`=家庭邀请绑定;`/api/health/report/proxy-parse` 的 `canProxyForFamily`=代传家庭校验。三者都**不是设备绑定** |
-| 结论 | 无端点承载,C-18 整条待实现(G-04);建议先由产品确认是"设备绑定"还是"账号绑定" |
+| 结论 | **账号绑定口径已落地(G-04)**:新增 `POST /api/auth/account/bind-verify` 校验登录账号↔家庭/成员绑定关系;设备维度(deviceId/异常设备二次验证)仍建议待产品确认后实现 |
 
 ### 3.4 SC-C-20 导出
 
@@ -156,15 +156,15 @@ EVD-9 启动时,`docs/tdd/orchestration/child-zone-kickoff-20261107.md` 在 `o
 | SC-C-07 | `child.dan.report.view` | DAN 报告列表/详情/对比 |
 | SC-C-08 | `child.plan.progress` | 方案任务进度 |
 | SC-C-09 | `child.achievement.view` | 勋章墙 + 统计 + 家庭排行 |
-| SC-C-10 | `child.achievement.view` | 解锁提醒(提醒子能力待实现) |
+| SC-C-10 | `child.achievement.view` | 解锁提醒(已实现:grantBadge 授予后写 user_notification + 五通道分发) |
 | SC-C-11 | `child.growth.view` | 成长记录只读(需补归属校验) |
 | SC-C-12 | `child.diet.view` | 今日食谱/餐次 |
 | SC-C-13 | `child.ai.chat` | AI 对话多轮(适龄过滤待补) |
 | SC-C-14 | `child.task.reject` | 驳回后重做再提交 |
 | SC-C-15 | `child.notification.view` | 站内消息接收/已读 |
-| SC-C-16 | `child.profile.view` | 受限资料投影(待实现) |
+| SC-C-16 | `child.profile.view` | 受限资料投影(已实现:getProfileView,role=child 裁剪 idCard/phone/realName/openid) |
 | SC-C-17 | `child.login` | 退出登录(前端清 token,后端待定) |
-| SC-C-18 | `child.login` | 设备/账号绑定校验(待实现) |
+| SC-C-18 | `child.login` | 账号绑定校验(已实现:`/api/auth/account/bind-verify`;设备维度待产品确认) |
 | SC-C-19 | `child.notification.view` | 家人/规划师通知 |
 | SC-C-20 | `child.growth.view` | 档案查看 + 家长代导出(待实现) |
 | SC-C-21 | `child.mind.capture` | 舌诊 + 情绪自拍采集 |
@@ -183,10 +183,10 @@ EVD-9 启动时,`docs/tdd/orchestration/child-zone-kickoff-20261107.md` 在 `o
 
 | ID | 类型 | 关联 SC | 缺口描述 | 证据 | 建议 |
 |----|------|---------|----------|------|------|
-| G-01 | 场景缺口 | C-10 | 勋章解锁无通知、无推送;`grantBadge` 只写 `member_badges` | `service/BadgeService.java:76` | `grantBadge` 内写 `user_notification`(type=badge_unlock)+ 订阅消息;或新增 `/api/badges/unlock-notices` |
-| G-02 | 场景缺口 | C-16 | 个人资料无"受限"投影,三个 info 端点返回完整 `User`(仅密码置空) | `controller/UserController.java:80`、`controller/auth/AuthController.java:186`、`controller/family/FamilyUserController.java:47` | 增加 `memberType=local`/`role=child` 的字段裁剪 VO(隐藏 `idCard`/`phone`/`realName`/`openid`) |
+| G-01 | 场景缺口 | C-10 | ~~勋章解锁无通知、无推送;`grantBadge` 只写 `member_badges`~~ **已实现**:`grantBadge` 授予后经 `NotificationDispatchService` 写 `user_notification`(type=badge_unlock,五通道分发),接收人优先成员关联可登录账号,local 成员回退同家庭可登录用户 | `service/BadgeService.java:grantBadge` | ✅ 已实现 |
+| G-02 | 场景缺口 | C-16 | ~~个人资料无"受限"投影,三个 info 端点返回完整 `User`~~ **已实现**:新增 `UserService.getProfileView`,`/api/user/info`、`/api/auth/info`、`/api/family/user/info` 统一走受限投影,`role=child` 时裁剪 `idCard/phone/realName/openid` | `service/UserService.java:getProfileView` | ✅ 已实现 |
 | G-03 | 场景缺口 | C-17 | 无服务端 logout;JWT 无状态 | 全库无 `/logout` 映射;`config/SecurityConfig.java:35` `logout().disable()` | 若需强制下线:加 token 黑名单/版本号;否则在契约中明确"退出=客户端清除" |
-| G-04 | 场景缺口 | C-18 | 无设备绑定/异常设备二次验证 | `controller/auth/AuthController.java`(18 个端点均无设备参数) | 新增 `device_bind` 表 + `/api/auth/device/verify`;或由产品确认该 SC 降级为"账号绑定校验" |
+| G-04 | 场景缺口 | C-18 | ~~无设备绑定/异常设备二次验证~~ **部分落地(账号绑定口径)**:新增 `POST /api/auth/account/bind-verify` 校验登录账号↔家庭/成员绑定关系(不新增表、不新增迁移);设备维度仍待产品确认后实现 | `controller/auth/AuthController.java`(新增 `/account/bind-verify`) | ✅ 账号绑定口径已实现;设备绑定待产品确认 |
 | G-05 | 场景缺口 | C-20 | 无"家长代导出指定成员";`exportUserData(userId)` 不接受 memberId | `service/AccountCleanupService.java`(`exportUserData`) | `/api/user/data-export` 增加可选 `memberId`(家长/管理员校验);顺手修 `assessmentResults` 查询口径 |
 | G-06 | 场景缺口 | C-23 | 无通用意见反馈端点/表/管理端;现有反馈均为专用方向 | `controller/DailyFeedbackController.java:21`、`controller/ActivityFeedbackController.java:11`、`controller/HealthReportController.java:2660` | 新增 `user_feedback` 表 + `POST /api/user/feedback/submit`(避开 `/api/feedback` 前缀冲突)+ 管理端受理 |
 | G-07 | 场景缺口 | C-26 | ①`sleep_record` 无 `tags` 列,标签被前端 `buildRemark()` 拼进 `remark` TEXT;②`/api/health/sleep/tags` 未实现;③`/api/admin/sleep/tags` 未实现;④key 命名 `sleep.quality.tags`(需求/用例)vs `sleep.config.tags`(sc-key-map);⑤`sleep-checkin.vue` 硬编码 8 项、无「正常」、未拉配置 | `entity/HealthSleepRecord.java`(无 tags)、`resources/schema.sql`(`sleep_record` 无 tags 列)、`controller/HealthSleepController.java`(仅 list/create)、`pages/growth/sleep-checkin.vue:188,405` | 迁移新增 `sleep_record.tags`;统一 key 为 `sleep.quality.tags` 并在 sc-key-map 加别名;补 `/api/health/sleep/tags`(默认 9 项含「正常」);前端拉配置 + 提交 `tags` 数组;补管理端页面 |