|
|
@@ -47,17 +47,23 @@ public class AccountCleanupService {
|
|
|
@Resource
|
|
|
private TaskMapper taskMapper;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private UserService userService;
|
|
|
+
|
|
|
+ /** 注销冷静期天数(auth.account.deactivate · SC-P-71:申请后保留可撤回的等待窗口) */
|
|
|
+ public static final long DEACTIVATE_COOLING_DAYS = 7L;
|
|
|
+
|
|
|
@Resource
|
|
|
private GrowthRecordMapper growthRecordMapper;
|
|
|
|
|
|
/**
|
|
|
- * 注销账号:检查未完成订单后,对用户数据进行匿名化处理
|
|
|
+ * 注销账号:检查未完成订单后,对用户数据进行匿名化处理(兼容旧单段立即注销入口)。
|
|
|
+ * <p>正式两阶段注销路径请走 {@link #applyDeactivate(Long, String)} → {@link #confirmDeactivate(Long)}。</p>
|
|
|
*/
|
|
|
@Transactional
|
|
|
public Map<String, Object> deactivateAccount(Long userId) {
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
|
|
|
- // 1. 查询用户
|
|
|
User user = userMapper.selectById(userId);
|
|
|
if (user == null) {
|
|
|
result.put("canDeactivate", false);
|
|
|
@@ -65,7 +71,135 @@ public class AccountCleanupService {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
- // 2. 检查是否有未完成订单
|
|
|
+ // 进行中订单 / 未结清测评门禁(契约边界,SC-P-71)
|
|
|
+ String block = checkPendingBusiness(user);
|
|
|
+ if (block != null) {
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", block);
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 立即注销:直接执行数据归档/删除(旧单段路径)
|
|
|
+ user.setDeactivateStatus("DONE");
|
|
|
+ user.setDeactivateApplyAt(new Date());
|
|
|
+ anonymizeUser(user);
|
|
|
+
|
|
|
+ log.info("账号已注销并匿名化: userId={}", userId);
|
|
|
+ result.put("canDeactivate", true);
|
|
|
+ result.put("message", "账号已成功注销,相关数据已匿名化处理");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 两阶段注销 · 阶段一:申请注销 + 身份验证前置(auth.account.deactivate · SC-P-71)。
|
|
|
+ * <p>校验登录密码后确认进入冷静期({@code deactivateStatus=PENDING}),不再立即匿名化;
|
|
|
+ * 冷静期满后再由 {@link #confirmDeactivate(Long)} 执行最终数据归档/删除。</p>
|
|
|
+ *
|
|
|
+ * @param userId 当前登录账号 ID
|
|
|
+ * @param verifyPassword 用于「身份验证」的登录密码(与登录态保持一致)
|
|
|
+ */
|
|
|
+ @Transactional
|
|
|
+ public Map<String, Object> applyDeactivate(Long userId, String verifyPassword) {
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
+
|
|
|
+ User user = userMapper.selectById(userId);
|
|
|
+ if (user == null) {
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", "用户不存在");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ if (user.getDeleted() != null && user.getDeleted() == 1) {
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", "账号已注销,无需重复申请");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 身份验证前置:SC-P-71 要求 申请 → 身份验证 → 冷静期 → 数据归档/删除
|
|
|
+ if (!userService.verifyPassword(userId, verifyPassword)) {
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", "身份验证失败,请核对登录密码");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 进行中订单 / 未结清测评门禁
|
|
|
+ String block = checkPendingBusiness(user);
|
|
|
+ if (block != null) {
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", block);
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 进入冷静期:保留可撤回等待窗口,不立即匿名化
|
|
|
+ user.setDeactivateStatus("PENDING");
|
|
|
+ user.setDeactivateApplyAt(new Date());
|
|
|
+ user.setUpdatedAt(new Date());
|
|
|
+ userMapper.updateById(user);
|
|
|
+
|
|
|
+ log.info("账号注销申请已受理,进入 {} 天冷静期: userId={}", DEACTIVATE_COOLING_DAYS, userId);
|
|
|
+ result.put("canDeactivate", true);
|
|
|
+ result.put("message", "注销申请已受理,进入" + DEACTIVATE_COOLING_DAYS
|
|
|
+ + "天冷静期,冷静期内可联系客服撤回,期满后可确认注销");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 两阶段注销 · 阶段二:冷静期满确认注销,执行数据归档/删除(auth.account.deactivate · SC-P-71)。
|
|
|
+ * <p>校验状态为 PENDING 且距 {@code deactivateApplyAt} ≥ {@value #DEACTIVATE_COOLING_DAYS} 天;
|
|
|
+ * 通过后才执行与 {@link #deactivateAccount} 等价的匿名化 + deleted=1。</p>
|
|
|
+ *
|
|
|
+ * @param userId 当前登录账号 ID
|
|
|
+ */
|
|
|
+ @Transactional
|
|
|
+ public Map<String, Object> confirmDeactivate(Long userId) {
|
|
|
+ Map<String, Object> result = new HashMap<>();
|
|
|
+
|
|
|
+ User user = userMapper.selectById(userId);
|
|
|
+ if (user == null) {
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", "用户不存在");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ if (user.getDeleted() != null && user.getDeleted() == 1) {
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", "账号已注销");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ if (user.getDeactivateApplyAt() == null || !"PENDING".equals(user.getDeactivateStatus())) {
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", "未提交注销申请,请先申请注销");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 冷静期未满:拒绝最终删除(SC-P-71 保留可撤回等待窗口)
|
|
|
+ long coolingMillis = DEACTIVATE_COOLING_DAYS * 24L * 60L * 60L * 1000L;
|
|
|
+ long elapsed = System.currentTimeMillis() - user.getDeactivateApplyAt().getTime();
|
|
|
+ if (elapsed < coolingMillis) {
|
|
|
+ long daysLeft = (coolingMillis - elapsed + 86400000L - 1L) / 86400000L;
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", "冷静期未满,还需等待约 " + daysLeft + " 天后方可确认注销");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 复检进行中订单 / 未结清测评(冷静期内可能新增)
|
|
|
+ String block = checkPendingBusiness(user);
|
|
|
+ if (block != null) {
|
|
|
+ result.put("canDeactivate", false);
|
|
|
+ result.put("message", block);
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ // 最终注销:数据归档/删除(匿名化 + deleted=1)
|
|
|
+ user.setDeactivateStatus("DONE");
|
|
|
+ anonymizeUser(user);
|
|
|
+
|
|
|
+ log.info("账号注销确认完成,数据已匿名化: userId={}", userId);
|
|
|
+ result.put("canDeactivate", true);
|
|
|
+ result.put("message", "账号已成功注销,相关数据已匿名化处理");
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+
|
|
|
+ /** 进行中支付订单 / 未结清测评门禁(两阶段与立即注销共用),无拦截返回 null */
|
|
|
+ private String checkPendingBusiness(User user) {
|
|
|
if (user.getFamilyId() != null) {
|
|
|
long pendingOrderCount = paymentOrderMapper.selectCount(
|
|
|
new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<PaymentOrder>()
|
|
|
@@ -73,31 +207,23 @@ public class AccountCleanupService {
|
|
|
.eq(PaymentOrder::getStatus, "pending")
|
|
|
);
|
|
|
if (pendingOrderCount > 0) {
|
|
|
- result.put("canDeactivate", false);
|
|
|
- result.put("message", "您有未完成的订单,请先处理后再注销账号");
|
|
|
- return result;
|
|
|
+ return "您有未完成的订单,请先处理后再注销账号";
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
long pendingAssessmentCount = assessmentOrderMapper.selectCount(
|
|
|
new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<AssessmentOrder>()
|
|
|
- .eq(AssessmentOrder::getUserId, userId)
|
|
|
+ .eq(AssessmentOrder::getUserId, user.getId())
|
|
|
.eq(AssessmentOrder::getStatus, "pending")
|
|
|
);
|
|
|
if (pendingAssessmentCount > 0) {
|
|
|
- result.put("canDeactivate", false);
|
|
|
- result.put("message", "您有未完成的测评,请先处理后再注销账号");
|
|
|
- return result;
|
|
|
- }
|
|
|
-
|
|
|
- // 3. 匿名化用户数据
|
|
|
- if (user == null) {
|
|
|
- result.put("canDeactivate", false);
|
|
|
- result.put("message", "用户不存在");
|
|
|
- return result;
|
|
|
+ return "您有未完成的测评,请先处理后再注销账号";
|
|
|
}
|
|
|
+ return null;
|
|
|
+ }
|
|
|
|
|
|
- // 匿名化主账号
|
|
|
+ /** 数据归档/删除:清空敏感字段、匿名化关联记录、置 deleted=1(两阶段与立即注销共用执行体) */
|
|
|
+ private void anonymizeUser(User user) {
|
|
|
+ // 匿名化主账号:openid 哈希 + 敏感字段清空 + deleted=1
|
|
|
String hashedOpenid = DigestUtils.md5DigestAsHex(
|
|
|
(user.getOpenid() + "_deleted_" + System.currentTimeMillis()).getBytes(StandardCharsets.UTF_8)
|
|
|
);
|
|
|
@@ -115,10 +241,10 @@ public class AccountCleanupService {
|
|
|
user.setUpdatedAt(new Date());
|
|
|
userMapper.updateById(user);
|
|
|
|
|
|
- // 3. 匿名化关联的FamilyMember记录
|
|
|
+ // 匿名化关联的 FamilyMember 记录
|
|
|
familyMemberMapper.selectList(
|
|
|
new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<FamilyMember>()
|
|
|
- .eq(FamilyMember::getUserId, userId)
|
|
|
+ .eq(FamilyMember::getUserId, user.getId())
|
|
|
).forEach(member -> {
|
|
|
member.setNickname("已注销");
|
|
|
member.setPhone("");
|
|
|
@@ -127,23 +253,15 @@ public class AccountCleanupService {
|
|
|
familyMemberMapper.updateById(member);
|
|
|
});
|
|
|
|
|
|
- // 4. 匿名化关联的ChatMessage记录
|
|
|
+ // 匿名化关联的 ChatMessage 记录(通过 inputsJson 包含 userId 做轻量过滤)
|
|
|
chatMessageMapper.selectList(
|
|
|
new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<ChatMessage>()
|
|
|
).stream()
|
|
|
- .filter(msg -> {
|
|
|
- // 尝试解析inputsJson找到userId,或通过conversation关联
|
|
|
- return msg.getInputsJson() != null && msg.getInputsJson().contains("\"" + userId + "\"");
|
|
|
- })
|
|
|
+ .filter(msg -> msg.getInputsJson() != null && msg.getInputsJson().contains("\"" + user.getId() + "\""))
|
|
|
.forEach(msg -> {
|
|
|
msg.setContent("[该用户已注销]");
|
|
|
chatMessageMapper.updateById(msg);
|
|
|
});
|
|
|
-
|
|
|
- log.info("账号已注销并匿名化: userId={}", userId);
|
|
|
- result.put("canDeactivate", true);
|
|
|
- result.put("message", "账号已成功注销,相关数据已匿名化处理");
|
|
|
- return result;
|
|
|
}
|
|
|
|
|
|
/**
|