From ce686969343fa1397761177b648bdf61d69da8fa Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 12 Sep 2025 15:46:35 +0800 Subject: [PATCH] =?UTF-8?q?TASK:=201.=20=E7=99=BB=E5=BD=95=E4=B8=8D?= =?UTF-8?q?=E5=8C=BA=E5=88=86=E9=82=AE=E7=AE=B1=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=202.=20=E5=B0=86=E6=89=80=E6=9C=89=E5=88=A0=E9=99=A4=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E6=93=8D=E4=BD=9C=E6=9B=B4=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BA=AB=E4=BB=BD=E4=B8=BA=E6=B8=B8=E5=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ai/da/service/AccountService.java | 2 +- .../da/service/impl/AccountServiceImpl.java | 40 +++++++++++++------ 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java index 36a0e582..edcffb46 100644 --- a/src/main/java/com/ai/da/service/AccountService.java +++ b/src/main/java/com/ai/da/service/AccountService.java @@ -203,7 +203,7 @@ public interface AccountService extends IService { Boolean addSubAccount(AddSubAccountDTO addSubAccountDTO); - Boolean deleteSubAccount(AddSubAccountDTO addSubAccountDTO); +// Boolean deleteSubAccount(AddSubAccountDTO addSubAccountDTO); void removeSubAccount(AddSubAccountDTO addSubAccountDTO); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 4e0181db..fab0efec 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -269,7 +269,7 @@ public class AccountServiceImpl extends ServiceImpl impl private Account getOneByEmailAndOrganizationName(String email, String organizationName) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("BINARY user_email", email); + queryWrapper.eq("user_email", email); if (StringUtils.isNotBlank(organizationName)) { queryWrapper.eq("organization_name", organizationName); } @@ -381,7 +381,9 @@ public class AccountServiceImpl extends ServiceImpl impl accountExtend.setAccountId(accountOld.getId()); accountExtendMapper.updateById(accountExtend); - accountMapper.deleteById(userHolder.getId()); +// accountMapper.deleteById(userHolder.getId()); + log.info("排查用户被删除原因：绑定邮箱，POST，删除用户（改为降为游客）"); + accountMapper.toVisitor(userHolder.getId()); String token = LocalCacheUtils.getTokenCache(String.valueOf(accountOld.getId())); if (StringUtils.isNotBlank(token)) { @@ -451,7 +453,8 @@ public class AccountServiceImpl extends ServiceImpl impl private Account getOneByEmail(String email) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("BINARY user_email", email); +// queryWrapper.eq("BINARY user_email", email); + queryWrapper.eq("user_email", email); List accountList = accountMapper.selectList(queryWrapper); if (CollectionUtil.isEmpty(accountList)) { throw new BusinessException("email.does.not.exist", ResultEnum.PROMPT.getCode()); @@ -805,11 +808,15 @@ public class AccountServiceImpl extends ServiceImpl impl LocalCacheUtils.delTokenCache(String.valueOf(accountDelete.getId())); } if (!userName.equals(userToBeUpdate.getUserName())) { - accountMapper.deleteById(accountDelete); +// accountMapper.deleteById(accountDelete); + log.info("排查用户被删除原因：deleteNoLoginRequired，true, 删除用户（改为降为游客）"); + accountMapper.toVisitor(accountDelete.getId()); userToBeUpdate.setUserName(userName); accountMapper.updateById(userToBeUpdate); } else { - accountMapper.deleteById(accountDelete); +// accountMapper.deleteById(accountDelete); + log.info("排查用户被删除原因：deleteNoLoginRequired，false, 删除用户（改为降为游客）"); + accountMapper.toVisitor(accountDelete.getId()); } } } @@ -1053,7 +1060,9 @@ public class AccountServiceImpl extends ServiceImpl impl if (StringUtils.isNotBlank(token)) { LocalCacheUtils.delTokenCache(String.valueOf(account.getId())); } - accountMapper.deleteById(account.getId()); +// accountMapper.deleteById(account.getId()); + log.info("排查用户被删除原因：deleteNoLoginRequiredNew，删除用户（改为降为游客）"); + accountMapper.toVisitor(account.getId()); // TODO:注销时删除用户数据，workspace，like，library等 } } @@ -1209,11 +1218,11 @@ public class AccountServiceImpl extends ServiceImpl impl String userEmail = accountDesignWorksRegisterDTO.getUserEmail(); log.info("注册账号。邮箱：{}", userEmail); QueryWrapper qwA = new QueryWrapper<>(); - qwA.eq("BINARY user_email", userEmail); + qwA.eq("user_email", userEmail); List accountList = accountMapper.selectList(qwA); QueryWrapper qwT = new QueryWrapper<>(); - qwT.eq("BINARY email", userEmail); + qwT.eq("email", userEmail); List trialOrders = trialOrderMapper.selectList(qwT); if (CollectionUtil.isNotEmpty(accountList) || CollectionUtil.isNotEmpty(trialOrders)) { throw new BusinessException("The email has already been registered"); @@ -2676,11 +2685,11 @@ public class AccountServiceImpl extends ServiceImpl impl } } - @Override + /*@Override public Boolean deleteSubAccount(AddSubAccountDTO addSubAccountDTO) { accountMapper.deleteBatchIds(addSubAccountDTO.getDeleteIdList()); return Boolean.TRUE; - } + }*/ public void removeSubAccount(AddSubAccountDTO addSubAccountDTO) { Long adminAccId = UserContext.getUserHolder().getId(); @@ -3172,6 +3181,7 @@ public class AccountServiceImpl extends ServiceImpl impl @Override @Transactional public AccountExtend bindWeChat(String code) { + log.info("code:{}", code); // 1. 获取 access_token 和 openid JSONObject accessTokenResponse = getAccessTokenFromWeChat(code); String accessToken = accessTokenResponse.getString("access_token"); @@ -3200,7 +3210,9 @@ public class AccountServiceImpl extends ServiceImpl impl AccountExtend accountExtend = accountExtends.get(0); AuthPrincipalVo authPrincipalVo = UserContext.getUserHolder(); - accountMapper.deleteById(accountExtend.getAccountId()); +// accountMapper.deleteById(accountExtend.getAccountId()); + log.info("排查用户被删除原因：bindWeChat，删除用户（改为降为游客）"); + accountMapper.toVisitor(accountExtend.getAccountId()); accountExtend.setAccountId(authPrincipalVo.getId()); accountExtendMapper.updateById(accountExtend); @@ -3260,7 +3272,9 @@ public class AccountServiceImpl extends ServiceImpl impl accountExtend.setAccountId(account.getId()); accountExtendMapper.updateById(accountExtend); - accountMapper.deleteById(userHolder.getId()); +// accountMapper.deleteById(userHolder.getId()); + log.info("排查用户被删除原因：bindEmail，GET，删除用户（改为降为游客）"); + accountMapper.toVisitor(accountExtend.getAccountId()); String token = LocalCacheUtils.getTokenCache(String.valueOf(account.getId())); if (StringUtils.isNotBlank(token)) { @@ -3495,6 +3509,8 @@ public class AccountServiceImpl extends ServiceImpl impl addSubAccountDTO.setUserName(dto.getEmail().substring(0, dto.getEmail().indexOf("@"))); addSubAccountDTO.setUserPassword(md5("123456abc")); addSubAccountDTO.setCreditsUsage(BigDecimal.ZERO); + addSubAccountDTO.setValidStartTime(parent.getValidStartTime()); + addSubAccountDTO.setValidEndTime(parent.getValidEndTime()); // 添加用户 addSubAccount(addSubAccountDTO); }