|
|
@@ -224,37 +224,34 @@ private String generateCode(String type) {
|
|
|
}
|
|
|
|
|
|
// 将规划师绑定到家庭
|
|
|
- family.setTeacherId(user.getId());
|
|
|
- family.setUpdatedAt(new Date());
|
|
|
- familyMapper.updateById(family);
|
|
|
-
|
|
|
- // 更新规划师的 teacherFamilyIds
|
|
|
- String currentIds = user.getTeacherFamilyIds();
|
|
|
- String newFamilyId = String.valueOf(family.getId());
|
|
|
- String updatedIds;
|
|
|
- if (currentIds == null || currentIds.isEmpty()) {
|
|
|
- updatedIds = newFamilyId;
|
|
|
- } else if (!currentIds.contains(newFamilyId)) {
|
|
|
- updatedIds = currentIds + "," + newFamilyId;
|
|
|
- } else {
|
|
|
- updatedIds = currentIds;
|
|
|
- }
|
|
|
- user.setTeacherFamilyIds(updatedIds);
|
|
|
- user.setUpdatedAt(new Date());
|
|
|
- userMapper.updateById(user);
|
|
|
-
|
|
|
- card.setUsed(1);
|
|
|
- card.setUpdatedAt(LocalDateTime.now());
|
|
|
- inviteCardMapper.updateById(card);
|
|
|
-
|
|
|
- result.put("needsTeacherRegister", false);
|
|
|
- result.put("token", jwtConfig.generateToken(user.getId(), user.getRole()));
|
|
|
- result.put("userId", user.getId());
|
|
|
- result.put("role", "teacher");
|
|
|
- result.put("teacherFamilyIds", updatedIds);
|
|
|
- return Result.success(result);
|
|
|
+ family.setTeacherId(user.getId());
|
|
|
+ family.setUpdatedAt(new Date());
|
|
|
+ familyMapper.updateById(family);
|
|
|
+
|
|
|
+ // 更新规划师的 teacherFamilyIds
|
|
|
+ String currentIds = user.getTeacherFamilyIds();
|
|
|
+ String newFamilyId = String.valueOf(family.getId());
|
|
|
+ String updatedIds;
|
|
|
+ if (currentIds == null || currentIds.isEmpty()) {
|
|
|
+ updatedIds = newFamilyId;
|
|
|
+ } else if (!currentIds.contains(newFamilyId)) {
|
|
|
+ updatedIds = currentIds + "," + newFamilyId;
|
|
|
+ } else {
|
|
|
+ updatedIds = currentIds;
|
|
|
}
|
|
|
+ user.setTeacherFamilyIds(updatedIds);
|
|
|
+ user.setUpdatedAt(new Date());
|
|
|
+ userMapper.updateById(user);
|
|
|
|
|
|
+ card.setUsed(1);
|
|
|
+ card.setUpdatedAt(LocalDateTime.now());
|
|
|
+ inviteCardMapper.updateById(card);
|
|
|
+
|
|
|
+ result.put("needsTeacherRegister", false);
|
|
|
+ result.put("token", jwtConfig.generateToken(user.getId(), user.getRole()));
|
|
|
+ result.put("userId", user.getId());
|
|
|
+ result.put("role", "teacher");
|
|
|
+ result.put("teacherFamilyIds", updatedIds);
|
|
|
return Result.success(result);
|
|
|
}
|
|
|
|