Sfoglia il codice sorgente

chore: auto bump version and changelog [skip ci]

iwt 1 mese fa
parent
commit
9cc05f6dba

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

@@ -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);
     }
 

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-bf6e998e5dfa161fd8c3e1d76ef28441c3337567
+6db9e7a6bbda1503aeaba20caf1b355b8f6a88f7