Browse Source

fix(backend): 切换家庭时迁移成员任务并刷新新旧家庭食材总览

switchMemberToFamily 原本漏迁移 tasks(任务仍挂在旧家庭,新家庭任务列表看不到),
也未刷新新旧家庭食材总览(T28 退出/踢人路径有、切换路径无)。
本次补充:
- migrateMemberAssets 增加 tasks 迁移(按 family_member_id / executor_id 匹配,
  兼容 child 任务 executor=成员卡id 与 parent 任务 executor=用户id 两种口径)
- switchMemberToFamily 末尾调用 refreshFoodOverviewQuietly 重算新旧家庭总览
Xiaogang Liao 1 day ago
parent
commit
8db653a0ca

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

@@ -12,6 +12,7 @@ import com.etotem.cfc.entity.FamilyMemberAttributes;
 import com.etotem.cfc.entity.FamilyMemberLog;
 import com.etotem.cfc.entity.FiveDimensionScore;
 import com.etotem.cfc.entity.HealthReport;
+import com.etotem.cfc.entity.Task;
 import com.etotem.cfc.entity.User;
 import com.etotem.cfc.enums.GenerationLevel;
 import com.etotem.cfc.mapper.FamilyMapper;
@@ -20,6 +21,7 @@ import com.etotem.cfc.mapper.FamilyMemberLogMapper;
 import com.etotem.cfc.mapper.FamilyMemberMapper;
 import com.etotem.cfc.mapper.FiveDimensionScoreMapper;
 import com.etotem.cfc.mapper.HealthReportMapper;
+import com.etotem.cfc.mapper.TaskMapper;
 import com.etotem.cfc.mapper.UserMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -76,6 +78,9 @@ public class FamilyMemberService {
     @Resource
     private FiveDimensionScoreMapper fiveDimensionScoreMapper;
 
+    @Resource
+    private TaskMapper taskMapper;
+
     @Resource
     private HealthReportMapper healthReportMapper;
 
@@ -972,6 +977,10 @@ vo.setIsSelf(viewerMember != null && viewerMember.getId().equals(fm.getId()));
         // 方案B补充:剥离切换成员本人从原家庭继承的会员身份(reconcileFamilyMembership 只处理仍留在原家庭的成员)
         membershipService.reconcileLeavingMemberMembership(userId, oldFamilyId, targetFamilyId);
 
+        // T28补充:切换家庭后刷新新旧家庭食材总览(该成员指数计入目标家庭、不再计入原家庭)
+        refreshFoodOverviewQuietly(oldFamilyId);
+        refreshFoodOverviewQuietly(targetFamilyId);
+
         logMemberAction(oldFamilyId, member.getId(), "switch", member.getNickname(), null, userId);
     }
 
@@ -982,6 +991,7 @@ vo.setIsSelf(viewerMember != null && viewerMember.getId().equals(fm.getId()));
      * - dan_assessment_results(测评):以 familyMemberId 关联,改 family_members.family_id 后自动跟随,无需迁移
      * - family_member_attributes(属性):以 memberId 关联,自动跟随
      * - family_relationships(关系):删旧建新(新家庭关系需重新计算)
+     * - tasks(任务):按 family_member_id / executor_id 迁移到目标家庭
      */
     private void migrateMemberAssets(FamilyMember member, Long oldFamilyId, Long targetFamilyId) {
         if (oldFamilyId.equals(targetFamilyId)) {
@@ -1017,6 +1027,27 @@ vo.setIsSelf(viewerMember != null && viewerMember.getId().equals(fm.getId()));
         } catch (Exception e) {
             log.warn("迁移健康报告异常: memberId={}", memberId, e);
         }
+        // 任务(育儿/健康任务):随成员切换到目标家庭(按 family_member_id 或 executor_id 匹配,
+        // 兼容 child 任务(executor=成员卡id)与 parent 任务(executor=用户id)两种口径)
+        try {
+            List<Task> memberTasks = taskMapper.selectList(
+                    new LambdaQueryWrapper<Task>()
+                            .eq(Task::getFamilyId, oldFamilyId)
+                            .and(w -> w.eq(Task::getFamilyMemberId, memberId)
+                                    .or().eq(Task::getExecutorId, memberId)
+                                    .or().eq(Task::getExecutorId, member.getUserId())));
+            int moved = 0;
+            for (Task t : memberTasks) {
+                t.setFamilyId(targetFamilyId);
+                moved += taskMapper.updateById(t);
+            }
+            if (moved > 0) {
+                log.info("切换家庭任务迁移: memberId={}, oldFamilyId={}, targetFamilyId={}, tasks={}",
+                        memberId, oldFamilyId, targetFamilyId, moved);
+            }
+        } catch (Exception e) {
+            log.warn("迁移任务异常: memberId={}", memberId, e);
+        }
     }
 
     /**