瀏覽代碼

feat(family): 家庭加入身份改由邀请人审批时指定(辈分关系)+修复夫妻称谓

按规格 docs/superpowers/specs/2026-11-07-family-join-dynamic-identity.md 落地:
- 加入申请不再自填家庭身份:join-form.vue 删除身份选择,request-join-by-code 的 familyRole 保留接收但忽略不写库
- 审批时指定身份:approve-request 改收 JoinApproveDTO(generationLevel/peerType),按审批人辈分(null视为0)+offset 求绝对辈分,落地 member.generation/isSpouse 并 createRelationsForNewMember 写 relation_type;mergeIntoFamily 分支同样落地
- 夫妻互称修复:FamilyRelationshipService.computeRelationshipLabel 增 3 参(spouse→丈夫/妻子,sibling→兄弟/姐妹,lineal→原逻辑),成员列表按 rel.relation_type 传参
- User.familyRole 按绝对辈分+性别推导(>=2 爷爷/奶奶,1 爸爸/妈妈,其余其他),回写申请表留痕(assigned_generation/assigned_peer_type)
- 审批卡片展示真实姓名+副行「申请加入你的家庭」,同意改弹窗内嵌 GenerationPicker(辈分必填/同辈必选类型)
迁移编号:runMigrations 已有「迁移454: 旧体系接口调用打点表」,故本次新增使用 455/456(偏离规格文字 454/455,详见代码注释)
Agnes Agent 1 周之前
父節點
當前提交
e2eb3617d

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

@@ -3463,6 +3463,14 @@ insertSysConfigSeed("gift_membership_pay_price", "198000", "送会员商品达
 
         // 迁移454: 旧体系接口调用打点表(P2-T3 退役证据,按 api_path+period 每日聚合)
         createLegacyDimensionCallLogTable();
+
+        // 迁移455: family_relationships 增加关系类型列(支持夫妻/兄弟姐妹/直系区分,家庭加入身份由邀请人指定)
+        // 规格: docs/superpowers/specs/2026-11-07-family-join-dynamic-identity.md(注:编号 455/456 因 454 已被打点表占用)
+        ensureColumn("family_relationships", "relation_type", "VARCHAR(20) DEFAULT 'lineal' COMMENT '关系类型: lineal/sibling/spouse'");
+
+        // 迁移456: family_join_requests 记录审批时指定的身份(可追溯)
+        ensureColumn("family_join_requests", "assigned_generation", "INT NULL COMMENT '审批时指定的绝对辈分'");
+        ensureColumn("family_join_requests", "assigned_peer_type", "VARCHAR(10) NULL COMMENT '审批时指定的同辈类型: sibling/spouse'");
     }
 
     /**

+ 14 - 5
cfc-backend/src/main/java/com/etotem/cfc/controller/family/FamilyInviteController.java

@@ -6,6 +6,7 @@ import com.etotem.cfc.dto.InviteAcceptDTO;
 import com.etotem.cfc.dto.InviteGenerateDTO;
 import com.etotem.cfc.dto.InviteRevokeDTO;
 import com.etotem.cfc.dto.InviteValidateDTO;
+import com.etotem.cfc.dto.JoinApproveDTO;
 import com.etotem.cfc.dto.TransferAdminDTO;
 import com.etotem.cfc.entity.Family;
 import com.etotem.cfc.entity.User;
@@ -145,21 +146,29 @@ public class FamilyInviteController {
 
     /**
      * 邀请人审批加入请求(谁分享的卡谁确认;旧数据无邀请人时由家庭管理员兜底)
+     * 身份由邀请人在审批时指定:generationLevel(辈分,必填)+ peerType(同辈类型,仅 peer 时必填)
      */
     @Operation(summary = "审批加入请求")
     @PostMapping("/approve-request")
-    public Result<Void> approveJoinRequest(@RequestBody Map<String, Object> body,
+    public Result<Void> approveJoinRequest(@RequestBody JoinApproveDTO dto,
         @RequestAttribute("userId") Long approverUserId) {
         if (approverUserId == null) {
             return Result.error("请先登录");
         }
-        Long requestId = ParamUtils.getLong(body.get("requestId"));
-        String comment = body.get("comment") != null ? body.get("comment").toString() : "";
-        if (requestId == null) {
+        if (dto == null || dto.getRequestId() == null) {
             return Result.error("请求ID不能为空");
         }
+        String generationLevel = dto.getGenerationLevel();
+        if (generationLevel == null || generationLevel.trim().isEmpty()) {
+            return Result.error("请选择辈分关系");
+        }
+        if ("peer".equals(generationLevel)
+                && (dto.getPeerType() == null || dto.getPeerType().trim().isEmpty())) {
+            return Result.error("请选择同辈关系类型");
+        }
         try {
-            familyJoinRequestService.approveJoinRequest(requestId, approverUserId, comment);
+            familyJoinRequestService.approveJoinRequest(dto.getRequestId(), approverUserId,
+                    dto.getComment() != null ? dto.getComment() : "", generationLevel, dto.getPeerType());
             return Result.success();
         } catch (Exception e) {
             return Result.error(e.getMessage());

+ 4 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/FamilyJoinRequestDTO.java

@@ -11,6 +11,7 @@ public class FamilyJoinRequestDTO implements Serializable {
     private Long id;
     private Long requesterUserId;
     private String requesterNickname;
+    private String requesterRealName; // 申请人真实姓名(缺失时前端回退昵称)
     private String requesterAvatar;
     private String inviteCode;
     private Long inviterUserId;
@@ -19,6 +20,9 @@ public class FamilyJoinRequestDTO implements Serializable {
     private String status; // pending / approved / rejected
     private String adminComment;
     private String familyRole; // 申请人在家庭中的角色
+    private Integer assignedGeneration; // 审批时指定的绝对辈分
+    private String assignedPeerType; // 审批时指定的同辈类型: sibling/spouse
+    private String assignedPeerLabel; // 同辈类型中文标签(配偶/兄弟姐妹)
     private String createdAt;
     private String updatedAt;
 }

+ 18 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/JoinApproveDTO.java

@@ -0,0 +1,18 @@
+package com.etotem.cfc.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 审批家庭加入请求 DTO(身份由邀请人在审批时指定:辈分关系 + 同辈类型)
+ */
+@Data
+public class JoinApproveDTO implements Serializable {
+    private Long requestId;
+    private String comment;
+    /** 辈分: great_grandparent|grandparent|parent|peer|child|grandchild|great_grandchild,必填 */
+    private String generationLevel;
+    /** 同辈类型: sibling|spouse,仅当 generationLevel=peer 时必填 */
+    private String peerType;
+}

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

@@ -44,6 +44,12 @@ public class FamilyJoinRequest implements Serializable {
     /** 申请人在家庭中的角色:爸爸/妈妈/爷爷/奶奶等 */
     private String familyRole;
 
+    /** 审批时指定的绝对辈分(邀请人在审批弹窗中选定,可追溯) */
+    private Integer assignedGeneration;
+
+    /** 审批时指定的同辈类型: sibling/spouse(仅同辈审批时写入) */
+    private String assignedPeerType;
+
     /** 创建时间 */
     private Date createdAt;
 

+ 3 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/FamilyRelationship.java

@@ -27,6 +27,9 @@ public class FamilyRelationship implements Serializable {
     /** 辈分值: -1=子女, 0=同辈, 1=父母, 2=祖父母, 3=曾祖父母 */
     private Integer generationValue;
 
+    /** 关系类型: lineal(直系默认)/sibling(同辈非配偶)/spouse(同辈配偶);双向各写一行,取值相同 */
+    private String relationType;
+
     /** 关系标签key(冗余用于显示) */
     private String relationshipKey;
 

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

@@ -7,6 +7,7 @@ import com.etotem.cfc.entity.Family;
 import com.etotem.cfc.entity.FamilyJoinRequest;
 import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.entity.User;
+import com.etotem.cfc.enums.GenerationLevel;
 import com.etotem.cfc.mapper.FamilyInvitationMapper;
 import com.etotem.cfc.mapper.FamilyJoinRequestMapper;
 import com.etotem.cfc.mapper.FamilyMapper;
@@ -43,6 +44,9 @@ public class FamilyJoinRequestService {
     @Resource
     private FamilyInvitationService familyInvitationService;
 
+    @Resource
+    private FamilyRelationshipService familyRelationshipService;
+
     @Resource
     private UnlockGateService unlockGateService;
 
@@ -128,7 +132,8 @@ public class FamilyJoinRequestService {
         request.setInviterUserId(inviterUserId);
         request.setJoinMethod(joinMethod);
         request.setInviteRef(inviteCode.trim());
-        request.setFamilyRole(familyRole);
+        // 身份改由邀请人审批时指定(规格 2026-11-07-family-join-dynamic-identity):
+        // familyRole 保留接收但忽略,不在此写入申请表;审批通过时按「绝对辈分+性别」回写推导值
         request.setStatus("pending");
         request.setCreatedAt(new Date());
         request.setUpdatedAt(new Date());
@@ -140,9 +145,17 @@ public class FamilyJoinRequestService {
     }
 
     /**
-     * 审批通过加入请求(审批人=邀请人,谁分享的卡谁确认;旧数据无邀请人时回退为家庭管理员)
+     * 审批通过加入请求(兼容旧调用:不指定辈分 → 仅写 familyRole,不落地辈分/关系)
      */
     public void approveJoinRequest(Long requestId, Long approverUserId, String comment) {
+        approveJoinRequest(requestId, approverUserId, comment, null, null);
+    }
+
+    /**
+     * 审批通过加入请求(审批人=邀请人,谁分享的卡谁确认;旧数据无邀请人时回退为家庭管理员)
+     * 身份由邀请人在审批时指定:generationLevel(辈分)+ peerType(同辈类型)
+     */
+    public void approveJoinRequest(Long requestId, Long approverUserId, String comment, String generationLevel, String peerType) {
         FamilyJoinRequest request = familyJoinRequestMapper.selectById(requestId);
         if (request == null) {
             throw new RuntimeException("加入请求不存在");
@@ -164,6 +177,32 @@ public class FamilyJoinRequestService {
             throw new RuntimeException("请求用户不存在");
         }
 
+        // 身份解析:generationLevel 为空 → 旧逻辑(仅写 familyRole);否则校验并计算绝对辈分
+        GenerationLevel level = GenerationLevel.fromValue(generationLevel);
+        boolean withIdentity = generationLevel != null && !generationLevel.trim().isEmpty();
+        if (withIdentity) {
+            if (level == null) {
+                throw new RuntimeException("请选择辈分关系");
+            }
+            if (level == GenerationLevel.PEER && !"sibling".equals(peerType) && !"spouse".equals(peerType)) {
+                throw new RuntimeException("请选择同辈关系类型");
+            }
+        }
+
+        // 绝对辈分 = 审批人成员辈分(null 视为 0)+ 选项 offset
+        Integer absoluteGeneration = null;
+        boolean isSpouse = false;
+        if (withIdentity) {
+            FamilyMember anchor = familyMemberMapper.selectOne(
+                    new LambdaQueryWrapper<FamilyMember>()
+                            .eq(FamilyMember::getFamilyId, family.getId())
+                            .eq(FamilyMember::getUserId, approverUserId)
+                            .last("LIMIT 1"));
+            int anchorGen = anchor != null && anchor.getGeneration() != null ? anchor.getGeneration() : 0;
+            absoluteGeneration = anchorGen + level.getOffset();
+            isSpouse = "peer".equals(generationLevel) && "spouse".equals(peerType);
+        }
+
         if (user.getFamilyId() != null && user.getFamilyId() != 0L && !user.getFamilyId().equals(family.getId())) {
             // 申请人已有其他家庭:切换会被拒绝的情形前置拦截,给出明确主体与解决指引。
             // 关键:错误主体是【申请人】而不是审批人——申请人若为原家庭创建者,切换家庭
@@ -189,7 +228,9 @@ public class FamilyJoinRequestService {
         } else {
             if (user.getFamilyId() == null || user.getFamilyId() == 0L || !user.getFamilyId().equals(family.getId())) {
                 user.setFamilyId(family.getId());
-                user.setFamilyRole(request.getFamilyRole());
+                if (!withIdentity) {
+                    user.setFamilyRole(request.getFamilyRole());
+                }
                 user.setUpdatedAt(new Date());
                 userMapper.updateById(user);
 
@@ -218,6 +259,44 @@ public class FamilyJoinRequestService {
             }
         }
 
+        // 身份与关系落地(新建家庭分支与合并家庭分支统一处理):
+        // 合并分支 mergeIntoFamily 已迁移成员记录并对旧关系做清理,此处补写辈分并重建与新家庭的关系。
+        if (withIdentity) {
+            FamilyMember member = familyMemberMapper.selectOne(
+                    new LambdaQueryWrapper<FamilyMember>()
+                            .eq(FamilyMember::getFamilyId, family.getId())
+                            .eq(FamilyMember::getUserId, user.getId())
+                            .last("LIMIT 1"));
+            if (member == null) {
+                // 兜底创建(merge 路径已保证成员记录存在,仅历史异常数据走此分支)
+                String memberAvatar = (user.getAvatar() != null && !user.getAvatar().isEmpty())
+                        ? user.getAvatar() : "/static/avatar.jpg";
+                member = new FamilyMember();
+                member.setFamilyId(family.getId());
+                member.setUserId(user.getId());
+                member.setNickname(user.getNickname());
+                member.setAvatar(memberAvatar);
+                member.setGender(user.getGender());
+                member.setShowToFamily(1);
+                member.setTotalPoints(0);
+                member.setCreatedAt(new Date());
+                member.setUpdatedAt(new Date());
+                familyMemberMapper.insert(member);
+            }
+            member.setGeneration(absoluteGeneration);
+            member.setIsSpouse(isSpouse);
+            member.setUpdatedAt(new Date());
+            familyMemberMapper.updateById(member);
+
+            // 与新家庭全体现有成员建立双向关系(含 relation_type: lineal/sibling/spouse)
+            familyRelationshipService.createRelationsForNewMember(family.getId(), member.getId(), absoluteGeneration, peerType);
+
+            // User.familyRole 由绝对辈分 + 性别推导,保证下游 DTO 不为空
+            user.setFamilyRole(deriveFamilyRole(absoluteGeneration, user.getGender()));
+            user.setUpdatedAt(new Date());
+            userMapper.updateById(user);
+        }
+
         // 平台推荐人绑定(需求:未注册/已注册但无推荐人 → 绑定为邀请人的上级推荐人;已有推荐人 → 不动)
         bindReferrerFromInviter(request, user);
 
@@ -232,6 +311,12 @@ public class FamilyJoinRequestService {
         request.setStatus("approved");
         request.setApproverUserId(approverUserId);
         request.setComment(comment);
+        if (withIdentity) {
+            // 回写申请表:推导的 familyRole + 审批时指定的绝对辈分/同辈类型(可追溯)
+            request.setFamilyRole(deriveFamilyRole(absoluteGeneration, user.getGender()));
+            request.setAssignedGeneration(absoluteGeneration);
+            request.setAssignedPeerType(peerType);
+        }
         request.setUpdatedAt(new Date());
         familyJoinRequestMapper.updateById(request);
 
@@ -242,7 +327,8 @@ public class FamilyJoinRequestService {
             log.warn("刷新家庭通关解锁失败(不阻断审批): requestId={}, error={}", requestId, e.getMessage());
         }
 
-        log.info("已审批通过加入请求: requestId={}, userId={}, approverId={}", requestId, user.getId(), approverUserId);
+        log.info("已审批通过加入请求: requestId={}, userId={}, approverId={}, generationLevel={}, peerType={}",
+                requestId, user.getId(), approverUserId, generationLevel, peerType);
     }
 
     /**
@@ -299,6 +385,7 @@ public class FamilyJoinRequestService {
             dto.setId(req.getId());
             dto.setRequesterUserId(req.getRequesterUserId());
             dto.setRequesterNickname(user != null ? user.getNickname() : "未知用户");
+            dto.setRequesterRealName(user != null ? user.getRealName() : null);
             dto.setRequesterAvatar(user != null ? user.getAvatar() : "");
             dto.setInviterUserId(req.getInviterUserId());
             dto.setInviteCode(req.getInviteRef());
@@ -307,6 +394,9 @@ public class FamilyJoinRequestService {
             dto.setTargetFamilyName(family != null ? family.getName() : "");
             dto.setStatus(req.getStatus());
             dto.setFamilyRole(req.getFamilyRole());
+            dto.setAssignedGeneration(req.getAssignedGeneration());
+            dto.setAssignedPeerType(req.getAssignedPeerType());
+            dto.setAssignedPeerLabel(assignedPeerLabel(req.getAssignedPeerType()));
             dto.setAdminComment(req.getComment());
             dto.setCreatedAt(req.getCreatedAt() != null ? req.getCreatedAt().toString() : "");
             return dto;
@@ -327,13 +417,21 @@ public class FamilyJoinRequestService {
             return null;
         }
         Family family = familyMapper.selectById(req.getTargetFamilyId());
+        User requester = req.getRequesterUserId() != null ? userMapper.selectById(req.getRequesterUserId()) : null;
         FamilyJoinRequestDTO dto = new FamilyJoinRequestDTO();
         dto.setId(req.getId());
+        dto.setRequesterUserId(req.getRequesterUserId());
+        dto.setRequesterNickname(requester != null ? requester.getNickname() : "");
+        dto.setRequesterRealName(requester != null ? requester.getRealName() : null);
+        dto.setRequesterAvatar(requester != null ? requester.getAvatar() : "");
         dto.setTargetFamilyId(req.getTargetFamilyId());
         dto.setTargetFamilyName(family != null ? family.getName() : "");
         dto.setStatus(req.getStatus());
         dto.setInviteCode(req.getInviteRef());
         dto.setFamilyRole(req.getFamilyRole());
+        dto.setAssignedGeneration(req.getAssignedGeneration());
+        dto.setAssignedPeerType(req.getAssignedPeerType());
+        dto.setAssignedPeerLabel(assignedPeerLabel(req.getAssignedPeerType()));
         dto.setAdminComment(req.getComment());
         dto.setCreatedAt(req.getCreatedAt() != null ? req.getCreatedAt().toString() : "");
         return dto;
@@ -415,4 +513,34 @@ public class FamilyJoinRequestService {
                     : "只有家庭管理员才能审批");
         }
     }
+
+    /**
+     * User.familyRole 推导表(绝对辈分 + 性别):
+     * ≥2 → 爷爷/奶奶(「姥爷/姥姥」无法由辈分推导,统一落奶奶/爷爷,用户可在「我的资料」修正)
+     * 1  → 爸爸/妈妈
+     * 其余 → 其他(保证 MemberCoverageDTO/MemberEnergyDTO/InsuranceGapDTO 等下游不为空)
+     */
+    private String deriveFamilyRole(int generation, String gender) {
+        boolean male = "male".equals(gender);
+        if (generation >= 2) {
+            return male ? "爷爷" : "奶奶";
+        }
+        if (generation == 1) {
+            return male ? "爸爸" : "妈妈";
+        }
+        return "其他";
+    }
+
+    /**
+     * 同辈类型中文标签(展示层冗余,与 utils/generationLevel.js PEER_TYPES 对应)
+     */
+    private String assignedPeerLabel(String peerType) {
+        if ("spouse".equals(peerType)) {
+            return "配偶";
+        }
+        if ("sibling".equals(peerType)) {
+            return "兄弟姐妹";
+        }
+        return "";
+    }
 }

+ 5 - 2
cfc-backend/src/main/java/com/etotem/cfc/service/FamilyMemberService.java

@@ -344,12 +344,14 @@ public class FamilyMemberService {
             // 计算视角相关的关系标签
             if (viewerMember != null) {
                 Integer genValue = null;
+                String relType = null;
                 if (familyRelationshipService != null && viewerMember.getId() != null) {
                     List<FamilyRelationship> rels = familyRelationshipService.getRelationsForMember(viewerMember.getId());
                     if (rels != null) {
                         for (FamilyRelationship rel : rels) {
                             if (rel.getToMemberId().equals(fm.getId())) {
                                 genValue = rel.getGenerationValue();
+                                relType = rel.getRelationType();
                                 break;
                             }
                         }
@@ -357,8 +359,9 @@ public class FamilyMemberService {
                 }
                 if (genValue != null) {
                     vo.setGenerationValue(genValue);
-                    vo.setRelativeLabel(familyRelationshipService.computeRelationshipLabel(genValue, fm.getGender()));
-                    vo.setRelationship(familyRelationshipService.computeRelationshipLabel(genValue, fm.getGender()));
+                    String label = familyRelationshipService.computeRelationshipLabel(genValue, fm.getGender(), relType);
+                    vo.setRelativeLabel(label);
+                    vo.setRelationship(label);
                 } else {
                     vo.setRelativeLabel(computeRelativeLabel(viewerMember, fm, familyMembers));
                     vo.setRelationship(computeRelativeLabel(viewerMember, fm, familyMembers));

+ 48 - 2
cfc-backend/src/main/java/com/etotem/cfc/service/FamilyRelationshipService.java

@@ -27,6 +27,14 @@ public class FamilyRelationshipService {
     @Resource
     private FamilyMemberMapper familyMemberMapper;
 
+    /**
+     * 为新成员创建与所有现有成员的双向关系(兼容旧调用:同辈类型按直系处理)
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void createRelationsForNewMember(Long familyId, Long newMemberId, Integer newMemberGeneration) {
+        createRelationsForNewMember(familyId, newMemberId, newMemberGeneration, null);
+    }
+
     /**
      * 为新成员创建与所有现有成员的双向关系
      * 算法:
@@ -34,9 +42,13 @@ public class FamilyRelationshipService {
      *   existingMi → newMember: generation = Mi.generation - newMemberGeneration
      *   newMember → existingMi: generation = newMemberGeneration - Mi.generation
      * - 如果 existingMi.generation == null, 默认 0
+     * - relationType 判定(双向各写一行,取值相同):
+     *   同辈且 peerType=spouse  → spouse
+     *   同辈且 peerType=sibling → sibling
+     *   其他                     → lineal(默认)
      */
     @Transactional(rollbackFor = Exception.class)
-    public void createRelationsForNewMember(Long familyId, Long newMemberId, Integer newMemberGeneration) {
+    public void createRelationsForNewMember(Long familyId, Long newMemberId, Integer newMemberGeneration, String peerType) {
         // 获取除新成员外的所有现有成员
         List<FamilyMember> existing = familyMemberMapper.selectList(
             new LambdaQueryWrapper<FamilyMember>()
@@ -47,17 +59,31 @@ public class FamilyRelationshipService {
             return; // 第一个成员,无需创建关系
         }
 
+        // 读取新成员(用于按对方性别生成关系标签)
+        FamilyMember newMember = familyMemberMapper.selectById(newMemberId);
+
         Date now = new Date();
         for (FamilyMember existingMember : existing) {
             int exGen = existingMember.getGeneration() != null ? existingMember.getGeneration() : 0;
             int newGen = newMemberGeneration != null ? newMemberGeneration : 0;
 
+            // 关系类型:双向取值相同
+            String relationType = "lineal";
+            if (exGen == newGen && "spouse".equals(peerType)) {
+                relationType = "spouse";
+            } else if (exGen == newGen && "sibling".equals(peerType)) {
+                relationType = "sibling";
+            }
+
             // A (existing) → B (new): generation = exGen - newGen
             FamilyRelationship rel1 = new FamilyRelationship();
             rel1.setFamilyId(familyId);
             rel1.setFromMemberId(existingMember.getId());
             rel1.setToMemberId(newMemberId);
             rel1.setGenerationValue(exGen - newGen);
+            rel1.setRelationType(relationType);
+            rel1.setRelationshipKey(computeRelationshipLabel(exGen - newGen,
+                    newMember != null ? newMember.getGender() : null, relationType));
             rel1.setCreatedAt(now);
             rel1.setUpdatedAt(now);
             try {
@@ -72,6 +98,9 @@ public class FamilyRelationshipService {
             rel2.setFromMemberId(newMemberId);
             rel2.setToMemberId(existingMember.getId());
             rel2.setGenerationValue(newGen - exGen);
+            rel2.setRelationType(relationType);
+            rel2.setRelationshipKey(computeRelationshipLabel(newGen - exGen,
+                    existingMember.getGender(), relationType));
             rel2.setCreatedAt(now);
             rel2.setUpdatedAt(now);
             try {
@@ -113,7 +142,7 @@ public class FamilyRelationshipService {
     }
 
     /**
-     * 根据辈分值计算关系标签
+     * 根据辈分值计算关系标签(保留 2 参重载:直系/默认逻辑)
      */
     public String computeRelationshipLabel(Integer generationValue, String gender) {
         if (generationValue == null) return "未知";
@@ -143,4 +172,21 @@ public class FamilyRelationshipService {
                     : "下" + Math.abs(generationValue) + "代";
         }
     }
+
+    /**
+     * 按查看者视角 + 关系类型输出称谓(R4):
+     * - spouse(同辈配偶)→ 男「丈夫」/女「妻子」(不再看辈分,配偶必然同辈)
+     * - sibling(同辈非配偶)→ 兄弟/姐妹
+     * - lineal/null → 原 2 参逻辑
+     */
+    public String computeRelationshipLabel(Integer generationValue, String gender, String relationType) {
+        boolean isMale = "male".equals(gender);
+        if ("spouse".equals(relationType)) {
+            return isMale ? "丈夫" : "妻子";
+        }
+        if ("sibling".equals(relationType)) {
+            return isMale ? "兄弟" : "姐妹";
+        }
+        return computeRelationshipLabel(generationValue, gender);
+    }
 }

+ 4 - 0
cfc-backend/src/main/resources/schema.sql

@@ -2294,6 +2294,7 @@ CREATE TABLE IF NOT EXISTS family_relationships (
     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=曾祖父母',
+    relation_type    VARCHAR(20)  DEFAULT 'lineal' COMMENT '关系类型: lineal(直系)/sibling(同辈非配偶)/spouse(同辈配偶)',
     relationship_key VARCHAR(50)  COMMENT '关系标签key(冗余用于显示, 如father/mother/son/daughter/spouse/sibling)',
     trust_score        DECIMAL(5,2) DEFAULT 0 COMMENT '信任度(答卷人视角)',
     intimacy_score     DECIMAL(5,2) DEFAULT 0 COMMENT '亲密度(答卷人视角)',
@@ -4816,6 +4817,9 @@ CREATE TABLE IF NOT EXISTS family_join_requests (
     status VARCHAR(20) DEFAULT 'pending' COMMENT '状态: pending/approved/rejected/cancelled',
     approver_user_id BIGINT COMMENT '审批人ID',
     comment TEXT COMMENT '审批备注',
+    family_role VARCHAR(20) DEFAULT NULL COMMENT '申请人在家庭中的角色:爸爸/妈妈/爷爷/奶奶等(审批通过时按绝对辈分+性别回写推导值)',
+    assigned_generation INT NULL COMMENT '审批时指定的绝对辈分',
+    assigned_peer_type VARCHAR(10) NULL COMMENT '审批时指定的同辈类型: sibling/spouse',
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
     updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     INDEX idx_requester (requester_user_id),

+ 4 - 31
cfc-frontend/pages/invite/join-form.vue

@@ -2,7 +2,7 @@
 	<view class="join-form-container" :style="{ '--font-scale': fontScale }">
 		<view class="header">
 			<text class="title">加入家庭</text>
-			<text class="subtitle">请填写您的真实姓名和家庭身份,提交后等待管理员审批</text>
+			<text class="subtitle">请填写您的真实姓名,提交后等待邀请人确认</text>
 		</view>
 
 		<view class="form-section">
@@ -12,14 +12,6 @@
 				<input type="text" v-model="form.realName" placeholder="请输入真实姓名" class="input" maxlength="20" />
 			</view>
 
-			<!-- 家庭身份(必填) -->
-			<view class="form-item">
-				<text class="label">家庭身份 <text class="required">*</text></text>
-				<picker mode="selector" :range="familyRoleOptions" :value="familyRoleIndex" @change="onFamilyRoleChange">
-					<view class="picker-input">{{ form.familyRole || '请选择(如:爸爸、妈妈)' }}</view>
-				</picker>
-			</view>
-
 			<!-- 昵称(选填,默认用户+手机尾号) -->
 			<view class="form-item">
 				<text class="label">昵称</text>
@@ -57,26 +49,14 @@ export default {
 	data() {
 		return {
 			familyInviteCode: '',
-			familyRoleOptions: ['爸爸', '妈妈', '爷爷', '奶奶', '姥爷', '姥姥', '其他'],
 			form: {
 				realName: '',
-				familyRole: '',
 				nickname: '',
 				avatar: ''
 			},
 			submitting: false
 		}
 	},
-	computed: {
-		familyRoleIndex: {
-			get() {
-				return this.familyRoleOptions.indexOf(this.form.familyRole)
-			},
-			set(val) {
-				this.form.familyRole = this.familyRoleOptions[val] || ''
-			}
-		}
-	},
 	onLoad(options) {
 		// 接收家庭邀请码:join.vue 传 familyInviteCode;登录页衔接传 pendingFamilyInviteCode 对应值
 		var code = (options && options.familyInviteCode) || uni.getStorageSync('pendingFamilyInviteCode') || ''
@@ -103,19 +83,12 @@ export default {
 				}
 			})
 		},
-		onFamilyRoleChange(e) {
-			this.form.familyRole = this.familyRoleOptions[e.detail.value] || ''
-		},
 		async submit() {
 			if (this.submitting) return
 			if (!this.form.realName || !this.form.realName.trim()) {
 				uni.showToast({ title: '请输入真实姓名', icon: 'none' })
 				return
 			}
-			if (!this.form.familyRole) {
-				uni.showToast({ title: '请选择家庭身份', icon: 'none' })
-				return
-			}
 			if (!this.familyInviteCode) {
 				uni.showToast({ title: '缺少家庭邀请码', icon: 'none' })
 				return
@@ -132,10 +105,10 @@ export default {
 				} catch (e) {
 					console.log('[join-form] 保存基本信息失败,继续提交加入申请', e)
 				}
-				// 提交加入家庭申请
-				await requestJoinByCode(this.familyInviteCode, this.form.familyRole)
+				// 提交加入家庭申请(身份由邀请人审批时指定,不再自填)
+				await requestJoinByCode(this.familyInviteCode)
 				uni.removeStorageSync('pendingFamilyInviteCode')
-				uni.showToast({ title: '加入家庭申请已提交,等待管理员审批', icon: 'success' })
+				uni.showToast({ title: '加入家庭申请已提交,等待邀请人确认', icon: 'success' })
 				setTimeout(function() {
 					uni.reLaunch({ url: '/pages/index-home/index' })
 				}, 1500)

+ 168 - 12
cfc-frontend/pages/profile-extra/family-members.vue

@@ -23,8 +23,8 @@
       <view class="jr-item" v-for="r in joinRequests" :key="r.id">
         <image class="jr-avatar" :src="r.requesterAvatar || '/static/default-avatar.png'" mode="aspectFill"></image>
         <view class="jr-info">
-          <text class="jr-name">{{ r.requesterNickname || '微信用户' }}</text>
-          <text class="jr-meta">希望以「{{ r.familyRole || '成员' }}」身份加入</text>
+          <text class="jr-name">{{ r.requesterRealName || r.requesterNickname || '微信用户' }}</text>
+          <text class="jr-meta">申请加入你的家庭</text>
         </view>
         <view class="jr-actions">
           <button class="jr-btn jr-accept" @click="onHandleJoinRequest(r, true)">同意</button>
@@ -168,6 +168,26 @@
       </view>
     </view>
 
+    <!-- ===== 同意加入申请弹窗(邀请人指定加入者辈分关系;不再 uni.showModal) ===== -->
+    <view class="modal-mask" v-if="showApproveModal" @click="closeApproveModal">
+      <view class="approve-modal-card" @click.stop>
+        <view class="approve-header">
+          <image class="approve-avatar" :src="approveTarget && (approveTarget.requesterAvatar || '/static/default-avatar.png')" mode="aspectFill"></image>
+          <view class="approve-info">
+            <text class="approve-name">{{ approveDisplayName }}</text>
+          </view>
+          <text class="approve-close" @click="closeApproveModal">×</text>
+        </view>
+        <text class="approve-desc">请选择 TA 与你的关系</text>
+        <!-- 与 pages/family/add-member.vue 同一组件、同一选项;提交时通过 $refs.approvePicker.selectedGen/selectedPeer 读取 -->
+        <generation-picker ref="approvePicker" :generationLevel="approveForm.generationLevel" :peerType="approveForm.peerType" />
+        <view class="approve-actions">
+          <button class="approve-btn approve-cancel" @click="closeApproveModal">取消</button>
+          <button class="approve-btn approve-confirm" :loading="approving" :disabled="approving" @click="confirmApprove">确认同意</button>
+        </view>
+      </view>
+    </view>
+
     <!-- ===== 底部操作栏 ===== -->
     <view class="bottom-bar">
       <button class="bottom-btn btn-add" @click="onAddMember">+ 添加成员</button>
@@ -257,6 +277,12 @@ export default {
       renameInput: '',
       renameSaving: false,
 
+      // ===== 同意加入申请弹窗状态(邀请人指定辈分关系) =====
+      showApproveModal: false,
+      approveTarget: null,
+      approveForm: { generationLevel: '', peerType: '' },
+      approving: false
+
       }
   },
   computed: {
@@ -287,6 +313,17 @@ export default {
       var list = this.permMembers || []
       var found = list.filter(function(m) { return String(m.value) === String(self.permGranteeUserId) })
       return found.length > 0 ? found[0].label : ''
+    },
+    // 同意加入弹窗标题:真实姓名(昵称),两者均缺省回退「微信用户」
+    approveDisplayName() {
+      var t = this.approveTarget
+      if (!t) return ''
+      var real = t.requesterRealName || ''
+      var nick = t.requesterNickname || ''
+      if (real && nick && real !== nick) {
+        return real + '(' + nick + ')'
+      }
+      return real || nick || '微信用户'
     }
   },
   onShow() {
@@ -821,28 +858,75 @@ export default {
       if (!r) {
         return
       }
-      var nickname = r.requesterNickname || '该用户'
+      if (approve) {
+        // 同意:弹出辈分关系选择弹窗(身份由邀请人指定,不再用 uni.showModal)
+        self.openApproveModal(r)
+        return
+      }
+      // 拒绝保持 uni.showModal
+      var nickname = r.requesterRealName || r.requesterNickname || '该用户'
       uni.showModal({
-        title: approve ? '同意加入' : '拒绝申请',
-        content: approve ? ('确定同意 ' + nickname + ' 加入家庭吗?') : ('确定拒绝 ' + nickname + ' 的加入申请吗?'),
+        title: '拒绝申请',
+        content: '确定拒绝 ' + nickname + ' 的加入申请吗?',
         success: function(mr) {
           if (mr.confirm) {
-            self.doHandleJoinRequest(r, approve)
+            self.doHandleJoinRequest(r, false)
           }
         }
       })
     },
+    openApproveModal(r) {
+      this.approveTarget = r
+      this.approveForm = { generationLevel: '', peerType: '' }
+      this.showApproveModal = true
+    },
+    closeApproveModal() {
+      if (this.approving) return
+      this.showApproveModal = false
+      this.approveTarget = null
+    },
+    async confirmApprove() {
+      var self = this
+      if (this.approving || !this.approveTarget) {
+        return
+      }
+      var picker = this.$refs.approvePicker
+      var selectedGen = (picker && picker.selectedGen) || this.approveForm.generationLevel
+      var selectedPeer = (picker && picker.selectedPeer) || this.approveForm.peerType
+      if (!selectedGen) {
+        uni.showToast({ title: '请选择辈分关系', icon: 'none' })
+        return
+      }
+      if (selectedGen === 'peer' && !selectedPeer) {
+        uni.showToast({ title: '请选择同辈关系类型', icon: 'none' })
+        return
+      }
+      this.approving = true
+      try {
+        var res = await approveJoinRequest(this.approveTarget.id, '', selectedGen, selectedPeer)
+        if (res && res.code === 200) {
+          uni.showToast({ title: '已同意加入', icon: 'success' })
+          this.showApproveModal = false
+          this.approveTarget = null
+          this.loadJoinRequests()
+          this.loadMembers()
+        } else {
+          uni.showToast({ title: (res && res.message) || '操作失败', icon: 'none' })
+          this.loadJoinRequests()
+        }
+      } catch (e) {
+        uni.showToast({ title: (e && e.message) || '操作失败', icon: 'none' })
+      } finally {
+        this.approving = false
+      }
+    },
     async doHandleJoinRequest(r, approve) {
       var self = this
       try {
-        var action = approve ? approveJoinRequest : rejectJoinRequest
-        var res = await action(r.id, '')
+        var res = await rejectJoinRequest(r.id, '')
         if (res && res.code === 200) {
-          uni.showToast({ title: approve ? '已同意加入' : '已拒绝', icon: 'success' })
+          uni.showToast({ title: '已拒绝', icon: 'success' })
           self.loadJoinRequests()
-          if (approve) {
-            self.loadMembers()
-          }
         } else {
           uni.showToast({ title: (res && res.message) || '操作失败', icon: 'none' })
           self.loadJoinRequests()
@@ -1422,4 +1506,76 @@ $c-elm-danger-text:  $el-danger; // Element UI 危险文字
 .rename-btn { flex: 1; border-radius: 24rpx; font-size: calc(28rpx * var(--font-scale, 1)); }
 .rename-cancel { background: $facade-fill-2; color: $facade-text-body; }
 .rename-save { background: $brand-primary; color: $app-surface; }
+
+/* ===== 同意加入申请弹窗 ===== */
+.approve-modal-card {
+  width: 600rpx;
+  background: $app-surface;
+  border-radius: 24rpx;
+  padding: 36rpx 32rpx 32rpx;
+}
+.approve-header {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-bottom: 16rpx;
+}
+.approve-avatar {
+  width: 88rpx;
+  height: 88rpx;
+  border-radius: 50%;
+  background: $facade-fill;
+  flex-shrink: 0;
+  margin-right: 18rpx;
+}
+.approve-info {
+  flex: 1;
+  min-width: 0;
+}
+.approve-name {
+  font-size: calc(32rpx * var(--font-scale, 1));
+  font-weight: 600;
+  color: $facade-text-strong;
+  display: block;
+}
+.approve-close {
+  font-size: calc(40rpx * var(--font-scale, 1));
+  color: $facade-text-muted;
+  padding: 0 8rpx;
+}
+.approve-desc {
+  font-size: calc(26rpx * var(--font-scale, 1));
+  color: $facade-text-muted;
+  margin-bottom: 24rpx;
+  display: block;
+}
+.approve-actions {
+  display: flex;
+  flex-direction: row;
+  gap: 20rpx;
+  margin-top: 32rpx;
+}
+.approve-btn {
+  flex: 1;
+  border-radius: 24rpx;
+  font-size: calc(28rpx * var(--font-scale, 1));
+  padding: 20rpx 0;
+  line-height: 1.4;
+  border: none;
+}
+.approve-btn::after {
+  border: none;
+}
+.approve-cancel {
+  background: $facade-fill-2;
+  color: $facade-text-body;
+}
+.approve-confirm {
+  background: $brand-primary;
+  color: $app-surface;
+}
+.approve-confirm[disabled] {
+  background: $facade-fill-2;
+  color: $facade-text-muted;
+}
 </style>

+ 11 - 5
cfc-frontend/utils/api.js

@@ -1555,8 +1555,9 @@ export const transferFamilyAdmin = (newAdminId) => {
 }
 
 // 通过邀请码/令牌申请加入家庭(token 路径绑定邀请人,等待邀请人确认;旧码路径管理员兜底)
-export const requestJoinByCode = (inviteCode, familyRole) => {
-  return request('/api/family/invite/request-join-by-code', 'POST', { inviteCode: inviteCode, familyRole: familyRole || '' })
+// 家庭身份不再由申请人自填(familyRole 由后端保留接收但忽略,身份转由邀请人审批时指定)
+export const requestJoinByCode = (inviteCode) => {
+  return request('/api/family/invite/request-join-by-code', 'POST', { inviteCode: inviteCode })
 }
 
 // 查询待我处理的加入请求(邀请人视角;旧数据由家庭管理员兜底)
@@ -1564,9 +1565,14 @@ export const getPendingJoinRequests = () => {
   return request('/api/family/invite/pending-requests', 'POST', {})
 }
 
-// 审批通过加入请求(邀请人确认;旧数据无邀请人时家庭管理员兜底)
-export const approveJoinRequest = (requestId, comment) => {
-  return request('/api/family/invite/approve-request', 'POST', { requestId: requestId, comment: comment || '' })
+// 审批通过加入请求(邀请人确认;身份由邀请人在审批弹窗中指定:辈分 + 同辈类型)
+export const approveJoinRequest = (requestId, comment, generationLevel, peerType) => {
+  return request('/api/family/invite/approve-request', 'POST', {
+    requestId: requestId,
+    comment: comment || '',
+    generationLevel: generationLevel || '',
+    peerType: peerType || ''
+  })
 }
 
 // 拒绝加入请求(邀请人;旧数据无邀请人时家庭管理员兜底)