Преглед изворни кода

chore: auto bump version and changelog [skip ci]

iwt пре 1 недеља
родитељ
комит
1bc3b4489d

+ 15 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/FamilyMemberService.java

@@ -205,6 +205,11 @@ public class FamilyMemberService {
             log.error("发放家庭人口券异常: memberId={}", member.getId(), e);
         }
 
+        // 方案B:新成员加入时,继承家庭现有有效会员身份
+        if (memberUserId != null) {
+            membershipService.syncMembershipForNewMember(memberUserId, familyId);
+        }
+
         return toFamilyMemberVO(member);
     }
 
@@ -520,6 +525,9 @@ public class FamilyMemberService {
         user.setUpdatedAt(new Date());
         userMapper.updateById(user);
 
+        // 方案B:成员离开后,重新核算原家庭会员身份(成员离开不影响新家庭,新家庭通常是新建的无会员)
+        membershipService.reconcileFamilyMembership(oldFamilyId);
+
         logMemberAction(oldFamilyId, member.getId(), "leave", member.getNickname(), null, userId);
     }
 
@@ -568,6 +576,9 @@ public class FamilyMemberService {
         }
 
         logMemberAction(targetFamilyId, memberId, "recycle", null, member.getNickname(), operatorUserId);
+
+        // 方案B:回收成员后,重新核算目标家庭会员身份
+        membershipService.reconcileFamilyMembership(targetFamilyId);
     }
 
     /**
@@ -629,6 +640,10 @@ public class FamilyMemberService {
         user.setUpdatedAt(new Date());
         userMapper.updateById(user);
 
+        // 方案B:切换家庭后,重新核算新旧家庭的会员身份
+        membershipService.reconcileFamilyMembership(targetFamilyId);
+        membershipService.reconcileFamilyMembership(oldFamilyId);
+
         logMemberAction(oldFamilyId, member.getId(), "switch", member.getNickname(), null, userId);
     }
 

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-75f9cd4c30f29a41d4ccf8887662e2422ee52fd8
+1f4aed30e47c9cd70b94d7e71a9ad7e6758008bf

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1359",
+  "version": "1.0.1360",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 6 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,12 @@
 
 ---
 
+## v1.0.1360 (2026-09-10)
+
+### Bug 修复
+- 修复 MembershipService 编译错误 - fromLevel 未定义、family 未定义、Set 缺失 import
+
+
 ## v1.0.1359 (2026-09-10)
 
 ### 新功能

+ 7 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.1359
+> 当前版本: v1.0.1360
 
 ## 历史版本
 
@@ -8,6 +8,12 @@
 
 ---
 
+## v1.0.1360 (2026-09-10)
+
+### Bug 修复
+- 修复 MembershipService 编译错误 - fromLevel 未定义、family 未定义、Set 缺失 import
+
+
 ## v1.0.1359 (2026-09-10)
 
 ### 新功能