aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/dev' into dev/dev

Browse Source
This commit is contained in:
xupei
2025-02-04 14:04:17 +08:00
parent 9199cdf7e2 8589216a77
commit 21b73d55f7
3 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/controller/AccountController.java
View File

@@ -51,7 +51,7 @@ public class AccountController {
@ApiOperation(value = "绑定邮箱") @ApiOperation(value = "绑定邮箱")
@PostMapping("/bindEmail") @PostMapping("/bindEmail")
public Response<Boolean> bindEmail(@Valid @RequestBody AccountBindEmailDTO accountBindEmailDTO) { public Response<BindEmailVO> bindEmail(@Valid @RequestBody AccountBindEmailDTO accountBindEmailDTO) {
return Response.success(accountService.bindEmail(accountBindEmailDTO)); return Response.success(accountService.bindEmail(accountBindEmailDTO));
} }

2
src/main/java/com/ai/da/service/AccountService.java
View File

@@ -48,7 +48,7 @@ public interface AccountService extends IService<Account> {
* @param accountBindEmailDTO * @param accountBindEmailDTO
* @return * @return
*/ */
Boolean bindEmail(AccountBindEmailDTO accountBindEmailDTO); BindEmailVO bindEmail(AccountBindEmailDTO accountBindEmailDTO);
BindEmailVO bindEmail(String email); BindEmailVO bindEmail(String email);

43
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -286,16 +286,14 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
} }
@Override @Override
public Boolean bindEmail(AccountBindEmailDTO accountBindEmailDTO) { public BindEmailVO bindEmail(AccountBindEmailDTO accountBindEmailDTO) {
// Account account = baseMapper.selectById(accountBindEmailDTO.getUserId());
AuthPrincipalVo userHolder = UserContext.getUserHolder(); AuthPrincipalVo userHolder = UserContext.getUserHolder();
Account account = accountMapper.selectById(userHolder.getId()); Account account = accountMapper.selectById(userHolder.getId());
if (Objects.isNull(account)) { if (Objects.isNull(account)) {
throw new BusinessException("userName.does.not.exist", ResultEnum.PROMPT.getCode()); throw new BusinessException("userName.does.not.exist", ResultEnum.PROMPT.getCode());
} }
// if (StringUtils.isNotBlank(account.getUserEmail())) {
// throw new BusinessException("user.has.bound.mailbox");
// }
//校验邮箱验证码 //校验邮箱验证码
String verifyCode = LocalCacheUtils.getVerifyCodeCache(AuthenticationOperationTypeEnum.BIND_MAILBOX.name() + "_" + accountBindEmailDTO.getUserEmail()); String verifyCode = LocalCacheUtils.getVerifyCodeCache(AuthenticationOperationTypeEnum.BIND_MAILBOX.name() + "_" + accountBindEmailDTO.getUserEmail());
if (StringUtils.isBlank(verifyCode)) { if (StringUtils.isBlank(verifyCode)) {
@@ -305,10 +303,37 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
throw new BusinessException("verification.code.error", ResultEnum.PROMPT.getCode()); throw new BusinessException("verification.code.error", ResultEnum.PROMPT.getCode());
} }
//绑定 //绑定
account.setUserEmail(accountBindEmailDTO.getUserEmail());
accountMapper.updateById(account); BindEmailVO result = new BindEmailVO();
// updatePwdByUserId(accountBindEmailDTO.getUserEmail(), accountBindEmailDTO.getUserId());
return Boolean.TRUE; QueryWrapper<Account> qw = new QueryWrapper<>();
qw.lambda().eq(Account::getUserEmail, accountBindEmailDTO.getUserEmail());
List<Account> accounts = accountMapper.selectList(qw);
if (CollectionUtil.isNotEmpty(accounts)) {
Account accountOld = accounts.get(0);
QueryWrapper<AccountExtend> accountExtendQW = new QueryWrapper<>();
accountExtendQW.lambda().eq(AccountExtend::getAccountId, userHolder.getId());
accountExtendQW.lambda().eq(AccountExtend::getAuthType, "Wechat");
AccountExtend accountExtend = accountExtendMapper.selectOne(accountExtendQW);
accountExtend.setAccountId(accountOld.getId());
accountExtendMapper.updateById(accountExtend);
accountMapper.deleteById(userHolder.getId());
String token = LocalCacheUtils.getTokenCache(String.valueOf(accountOld.getId()));
if (StringUtils.isNotBlank(token)) {
//用户已登入
result.setToken(token);
} else {
result.setToken(createAccountToken(accountOld));
}
return result;
}
Account accountNew = accountMapper.selectById(userHolder.getId());
accountNew.setUserEmail(accountBindEmailDTO.getUserEmail());
accountMapper.updateById(accountNew);
return result;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)