Kaynağa Gözat

feat: T38 团队邀请功能(邀请码生成/信息/凭码加入 + 前端邀请入口)——基于 origin/cfclub 重构,修复迁移号冲突(427→444),加强空值/匿名防护

Sisyphus 2 hafta önce
ebeveyn
işleme
f1a1a757d3

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

@@ -15043,7 +15043,7 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
             log.warn("迁移426: 创建 attribution_reports 表失败(可能已存在): {}", e.getMessage());
         }
 
-        // 迁移427: supply_system_member 添加 invite_code 列(T38 团队邀请功能,2026-11-02)
+        // 迁移444: supply_system_member 添加 invite_code 列(T38 团队邀请功能,2026-11-02)
         // 每个成员一个个人专属邀请码;已生成复用,支持刷新重置旧码(旧码随之失效)
         ensureColumn("supply_system_member", "invite_code",
                 "VARCHAR(32) DEFAULT NULL COMMENT '个人专属邀请码(团队邀请, T38)'");

+ 80 - 32
cfc-backend/src/main/java/com/etotem/cfc/service/SupplySystemService.java

@@ -222,26 +222,50 @@ public class SupplySystemService extends ServiceImpl<SupplySystemMapper, SupplyS
         if (systemId == null) {
             return Result.error("systemId不能为空");
         }
-        if (userId == null) {
-            return Result.error("未登录");
-        }
-        if (!isMemberOrAdmin(systemId, userId)) {
-            return Result.error("您不是该团队成员,无法生成邀请码");
+        if (userId == null || userId <= 0) {
+            return Result.error("请先登录");
         }
         SupplySystem system = this.getById(systemId);
         if (system == null) {
             return Result.error("团队不存在");
         }
+        if (!"active".equals(system.getStatus())) {
+            return Result.error("该团队已停用,无法生成邀请码");
+        }
+        // 越权防护:当前用户必须为该体系的 admin 或 active 成员
+        if (system.getAdminId() == null || !system.getAdminId().equals(userId)) {
+            Long count = supplySystemMemberMapper.selectCount(
+                new LambdaQueryWrapper<SupplySystemMember>()
+                    .eq(SupplySystemMember::getSystemId, systemId)
+                    .eq(SupplySystemMember::getUserId, userId)
+                    .eq(SupplySystemMember::getStatus, "active"));
+            if (count == null || count == 0L) {
+                return Result.error("您不是该团队成员,无法生成邀请码");
+            }
+        }
 
         SupplySystemMember member = supplySystemMemberMapper.selectOne(
             new LambdaQueryWrapper<SupplySystemMember>()
                 .eq(SupplySystemMember::getSystemId, systemId)
                 .eq(SupplySystemMember::getUserId, userId));
         if (member == null) {
-            return Result.error("您不是该团队成员,无法生成邀请码");
+            // 防御:部分旧数据可能无 member 记录(如 T31 getMyTeams 已处理)
+            // 为体系管理员自动补录成员记录,使其可正常生成邀请码
+            if (system.getAdminId() != null && system.getAdminId().equals(userId)) {
+                member = new SupplySystemMember();
+                member.setSystemId(systemId);
+                member.setUserId(userId);
+                member.setRole("admin");
+                member.setStatus("active");
+                member.setJoinedAt(new Date());
+                supplySystemMemberMapper.insert(member);
+            } else {
+                return Result.error("您不是该团队成员,无法生成邀请码");
+            }
         }
 
         String code = member.getInviteCode();
+        // 幂等:已生成复用;refresh=true 重置旧码(旧码随之失效)
         if (refresh || code == null || code.trim().isEmpty()) {
             code = generateUniqueInviteCode();
             member.setInviteCode(code);
@@ -255,6 +279,20 @@ public class SupplySystemService extends ServiceImpl<SupplySystemMapper, SupplyS
         return Result.success(data);
     }
 
+    /**
+     * 按邀请码查成员(幂等;取首行:invite_code 无 DB 唯一索引,历史重复行不抛 TooManyResultsException)
+     */
+    private SupplySystemMember findMemberByInviteCode(String inviteCode) {
+        if (inviteCode == null || inviteCode.trim().isEmpty()) {
+            return null;
+        }
+        java.util.List<SupplySystemMember> list = supplySystemMemberMapper.selectList(
+            new LambdaQueryWrapper<SupplySystemMember>()
+                .eq(SupplySystemMember::getInviteCode, inviteCode.trim())
+                .last("LIMIT 1"));
+        return (list == null || list.isEmpty()) ? null : list.get(0);
+    }
+
     /**
      * 凭邀请码查询邀请信息(确认页展示用):团队名、邀请人昵称/头像、成员数。
      * 不泄露其他隐私(不返回邀请人手机号等)。
@@ -263,37 +301,51 @@ public class SupplySystemService extends ServiceImpl<SupplySystemMapper, SupplyS
         if (inviteCode == null || inviteCode.trim().isEmpty()) {
             return Result.error("邀请码不能为空");
         }
-        SupplySystemMember inviter = supplySystemMemberMapper.selectOne(
-            new LambdaQueryWrapper<SupplySystemMember>()
-                .eq(SupplySystemMember::getInviteCode, inviteCode.trim()));
+        SupplySystemMember inviter = findMemberByInviteCode(inviteCode);
         if (inviter == null || !"active".equals(inviter.getStatus())) {
             return Result.error("邀请码不存在或已失效");
         }
-        return Result.success(buildInviteInfo(inviter));
+        SupplySystem system = this.getById(inviter.getSystemId());
+        if (system == null) {
+            return Result.error("团队不存在");
+        }
+        if (!"active".equals(system.getStatus())) {
+            return Result.error("该团队已停用,邀请码失效");
+        }
+        return Result.success(buildInviteInfo(inviter, system));
     }
 
     /**
      * 凭邀请码加入团队:校验码有效 + 用户未加入过该体系 →
      * ① addMember(systemId,userId,role=member,status=active) ② addRelation(systemId, inviterId, userId)
-     * 挂 parentId=邀请人 / level=父level+1。被移除(inactive)后可再申请。
+     * 挂 parentId=邀请人 / level=父level+1。被移除(status=inactive)后可再申请(复活成员记录)。
      */
     @Transactional
     public Result<Map<String, Object>> joinByInviteCode(String inviteCode, Long userId) {
         if (inviteCode == null || inviteCode.trim().isEmpty()) {
             return Result.error("邀请码不能为空");
         }
-        if (userId == null) {
-            return Result.error("未登录");
+        if (userId == null || userId <= 0) {
+            return Result.error("请先登录");
         }
-        SupplySystemMember inviter = supplySystemMemberMapper.selectOne(
-            new LambdaQueryWrapper<SupplySystemMember>()
-                .eq(SupplySystemMember::getInviteCode, inviteCode.trim()));
+        SupplySystemMember inviter = findMemberByInviteCode(inviteCode);
         if (inviter == null || !"active".equals(inviter.getStatus())) {
             return Result.error("邀请码不存在或已失效");
         }
         Long systemId = inviter.getSystemId();
+        SupplySystem system = this.getById(systemId);
+        if (system == null) {
+            return Result.error("团队不存在");
+        }
+        if (!"active".equals(system.getStatus())) {
+            return Result.error("该团队已停用,无法加入");
+        }
+        if (inviter.getUserId().equals(userId)) {
+            return Result.error("不能使用自己的邀请码加入自己的团队");
+        }
 
-        // 校验用户未加入过该体系(inactive 可再申请:复活成员记录)
+        // ① 加入团队成员:addMember 自带 (systemId,userId) existing 检查(uk_system_user 唯一键)
+        // 边界:active 成员拒绝重复加入(避免静默改挂上级);inactive(被移除)可再申请 → 复活
         SupplySystemMember existing = supplySystemMemberMapper.selectOne(
             new LambdaQueryWrapper<SupplySystemMember>()
                 .eq(SupplySystemMember::getSystemId, systemId)
@@ -301,22 +353,19 @@ public class SupplySystemService extends ServiceImpl<SupplySystemMapper, SupplyS
         if (existing != null && "active".equals(existing.getStatus())) {
             return Result.error("您已在该团队中,无需重复加入");
         }
-        if (existing != null) {
-            existing.setStatus("active");
-            existing.setRole("member");
-            existing.setJoinedAt(new Date());
-            supplySystemMemberMapper.updateById(existing);
-        } else {
-            SupplySystemMember member = new SupplySystemMember();
-            member.setSystemId(systemId);
-            member.setUserId(userId);
-            member.setRole("member");
+        SupplySystemMember member = (existing != null) ? existing
+                : addMember(systemId, userId);
+        if (member == null) {
+            return Result.error("加入失败:成员记录创建异常");
+        }
+        if (!"active".equals(member.getStatus())) {
+            // 被移除后可再申请:复活成员记录(保留原 role,避免自助降级 admin/特权重置)
             member.setStatus("active");
             member.setJoinedAt(new Date());
-            supplySystemMemberMapper.insert(member);
+            supplySystemMemberMapper.updateById(member);
         }
 
-        // 挂邀请人为上级(parentId=邀请人, level=父level+1);inactive 旧关系复活
+        // ② 挂邀请人为上级(parentId=邀请人, level=父level+1);已存在关系则重挂到新邀请人并复活
         // 注:supply_hierarchy 唯一键为 (system_id, parent_id, child_id),历史数据可能同一 child 多行,
         // 故用 getOne(wrapper, false) 取首行而不抛 TooManyResultsException
         SupplyHierarchy existingRel = supplyHierarchyService.getOne(
@@ -342,16 +391,15 @@ public class SupplySystemService extends ServiceImpl<SupplySystemMapper, SupplyS
             supplyHierarchyService.addRelation(systemId, inviter.getUserId(), userId);
         }
 
-        return Result.success(buildInviteInfo(inviter));
+        return Result.success(buildInviteInfo(inviter, system));
     }
 
     /**
      * 组装邀请信息(确认页/加入结果共用)
      */
-    private Map<String, Object> buildInviteInfo(SupplySystemMember inviter) {
+    private Map<String, Object> buildInviteInfo(SupplySystemMember inviter, SupplySystem system) {
         Map<String, Object> data = new HashMap<>();
         data.put("systemId", inviter.getSystemId());
-        SupplySystem system = this.getById(inviter.getSystemId());
         data.put("teamName", system != null ? system.getName() : null);
 
         User inviterUser = userMapper.selectById(inviter.getUserId());