Просмотр исходного кода

feat: 注册引导-登录响应新增needsFamily标记

Xiaogang Liao 1 месяц назад
Родитель
Сommit
709d503e19

+ 1 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/LoginResultDTO.java

@@ -14,6 +14,7 @@ public class LoginResultDTO {
     private Boolean isNewUser; // 是否新用户
     private Boolean isNewUser; // 是否新用户
     private String openid; // 微信openid,用于前端缓存实现自动登录
     private String openid; // 微信openid,用于前端缓存实现自动登录
     private Boolean needsRoleSelect; // 新用户是否需要选择角色
     private Boolean needsRoleSelect; // 新用户是否需要选择角色
+    private Boolean needsFamily; // familyId 为空或 0 时为 true,前端据此决定是否引导建家庭
     private String teacherStatus; // 成长规划师审核状态: pending/approved/rejected
     private String teacherStatus; // 成长规划师审核状态: pending/approved/rejected
     private String teacherRejectReason; // 成长规划师审核拒绝原因
     private String teacherRejectReason; // 成长规划师审核拒绝原因
     private Boolean hasTeacherRole; // 用户是否拥有teacher角色
     private Boolean hasTeacherRole; // 用户是否拥有teacher角色

+ 9 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/UserService.java

@@ -162,6 +162,7 @@ private FamilyInvitationService familyInvitationService;
 
 
         // 新用户需要完善信息(仅当需要选择角色时)
         // 新用户需要完善信息(仅当需要选择角色时)
         result.setNeedsRoleSelect(isNewUser);
         result.setNeedsRoleSelect(isNewUser);
+        result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
         populateTeacherFields(result, user);
         populateTeacherFields(result, user);
 
 
         return result;
         return result;
@@ -241,6 +242,7 @@ private FamilyInvitationService familyInvitationService;
   result.setNickname(user.getNickname());
   result.setNickname(user.getNickname());
   result.setIsNewUser(isNewUser);
   result.setIsNewUser(isNewUser);
   result.setNeedsRoleSelect(isNewUser);
   result.setNeedsRoleSelect(isNewUser);
+  result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
   populateTeacherFields(result, user);
   populateTeacherFields(result, user);
 
 
   return result;
   return result;
@@ -300,6 +302,7 @@ private FamilyInvitationService familyInvitationService;
         result.setNickname(user.getNickname());
         result.setNickname(user.getNickname());
         result.setIsNewUser(false);
         result.setIsNewUser(false);
         result.setOpenid(openid);
         result.setOpenid(openid);
+        result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
         populateTeacherFields(result, user);
         populateTeacherFields(result, user);
 
 
         return result;
         return result;
@@ -334,6 +337,7 @@ private FamilyInvitationService familyInvitationService;
         result.setNickname(user.getNickname());
         result.setNickname(user.getNickname());
         result.setIsNewUser(false);
         result.setIsNewUser(false);
         result.setOpenid(openid);
         result.setOpenid(openid);
+        result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
         populateTeacherFields(result, user);
         populateTeacherFields(result, user);
 
 
         return result;
         return result;
@@ -424,6 +428,7 @@ private FamilyInvitationService familyInvitationService;
         result.setFamilyId(user.getFamilyId());
         result.setFamilyId(user.getFamilyId());
         result.setNickname(user.getNickname());
         result.setNickname(user.getNickname());
         result.setIsNewUser(true);
         result.setIsNewUser(true);
+        result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
         populateTeacherFields(result, user);
         populateTeacherFields(result, user);
 
 
         return result;
         return result;
@@ -499,6 +504,7 @@ private FamilyInvitationService familyInvitationService;
         result.setFamilyId(user.getFamilyId());
         result.setFamilyId(user.getFamilyId());
         result.setNickname(user.getNickname());
         result.setNickname(user.getNickname());
         result.setIsNewUser(false);
         result.setIsNewUser(false);
+        result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
         populateTeacherFields(result, user);
         populateTeacherFields(result, user);
         return result;
         return result;
     }
     }
@@ -803,6 +809,7 @@ private FamilyInvitationService familyInvitationService;
         result.setRole(user.getRole());
         result.setRole(user.getRole());
         result.setFamilyId(user.getFamilyId());
         result.setFamilyId(user.getFamilyId());
         result.setNickname(user.getNickname());
         result.setNickname(user.getNickname());
+        result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
         populateTeacherFields(result, user);
         populateTeacherFields(result, user);
 
 
         return result;
         return result;
@@ -1217,6 +1224,7 @@ FamilyMember child = familyMemberMapper.selectById(memberId);
             result.setFamilyId(user.getFamilyId());
             result.setFamilyId(user.getFamilyId());
             result.setNickname(user.getNickname());
             result.setNickname(user.getNickname());
             result.setIsNewUser(true);
             result.setIsNewUser(true);
+            result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
             populateTeacherFields(result, user);
             populateTeacherFields(result, user);
             return result;
             return result;
         }
         }
@@ -1292,6 +1300,7 @@ FamilyMember child = familyMemberMapper.selectById(memberId);
         result.setFamilyId(user.getFamilyId());
         result.setFamilyId(user.getFamilyId());
         result.setNickname(user.getNickname());
         result.setNickname(user.getNickname());
         result.setIsNewUser(isNewUser);
         result.setIsNewUser(isNewUser);
+        result.setNeedsFamily(user.getFamilyId() == null || user.getFamilyId() == 0L);
         populateTeacherFields(result, user);
         populateTeacherFields(result, user);
 
 
         return result;
         return result;