فهرست منبع

refactor: role=child 判断清理(历史兼容注释 + InviteCard role 改为 parent)

iwt 2 هفته پیش
والد
کامیت
d3d2c4eb4d

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

@@ -38,6 +38,7 @@ public class FamilyChallengeController {
     public Result<Void> updateProgress(@RequestBody Map<String, Object> params,
                                        @RequestAttribute(value = "role", required = false) String role,
                                        @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId) {
+        // 新模型下 role 不再有 'child',此条件永远为 true(历史兼容)
         if (!"child".equals(role)) {
             return Result.error("仅孩子可打卡");
         }

+ 2 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/mind/EmotionCheckinController.java

@@ -57,6 +57,7 @@ public class EmotionCheckinController {
         Long memberId = ParamUtils.getLong(params.get("memberId"), currentMemberId);
         int page = params.containsKey("page") ? Integer.parseInt(params.get("page").toString()) : 1;
         int size = params.containsKey("size") ? Integer.parseInt(params.get("size").toString()) : 20;
+        // 新模型下 role 不再有 'child',hidePhoto 永远为 false(历史兼容)
         boolean hidePhoto = !"child".equals(role);
         Object result = emotionCheckinService.getCheckinList(memberId, page, size, userId, hidePhoto);
         return Result.success(result);
@@ -68,6 +69,7 @@ public class EmotionCheckinController {
                             @RequestAttribute("role") String role,
                             @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId) {
         Long memberId = ParamUtils.getLong(params.get("memberId"), currentMemberId);
+        // 新模型下 role 不再有 'child',hidePhoto 永远为 false(历史兼容)
         boolean hidePhoto = !"child".equals(role);
         Object result = emotionCheckinService.getLatestCheckin(memberId, userId, hidePhoto);
         return Result.success(result);

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

@@ -35,6 +35,7 @@ public class WishController {
             @RequestBody CreateWishDTO dto) {
         try {
             Long wishId;
+            // 新模型下 user.role 不再有 'child',此分支为历史兼容(旧账号)
             if ("child".equals(role)) {
                 wishId = wishService.createByChild(userId, dto);
             } else {

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

@@ -45,6 +45,7 @@ public class FamilyHealthScoreService {
             }
         }
 
+        // 新模型下 role 不再有 'child',此分支为历史兼容
         if ("child".equals(role)) {
             FamilyMember self = null;
             for (FamilyMember m : children) {

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

@@ -163,7 +163,7 @@ private String generateCode(String type) {
         Map<String, Object> result = new HashMap<>();
         result.put("token", jwtConfig.generateToken(user.getId(), user.getRole()));
         result.put("userId", user.getId());
-        result.put("role", "child");
+        result.put("role", "parent"); // 不可登录成员 role 统一 parent(新模型)
         result.put("familyId", user.getFamilyId());
         return Result.success(result);
     }