From 3dc432131c1667afd401547f8bbfeca47e42ad5c Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Thu, 19 Dec 2024 11:13:30 +0800
Subject: [PATCH] TASK:AiDA

---
 .../com/ai/da/model/dto/AccountBindEmailDTO.java    |  6 +++---
 .../com/ai/da/service/impl/AccountServiceImpl.java  | 13 ++++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java
index 8671e051..d0b67792 100644
--- a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java
+++ b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java
@@ -11,9 +11,9 @@ import javax.validation.constraints.NotNull;
 @ApiModel("绑定邮箱")
 public class AccountBindEmailDTO {
 
-    @NotNull(message = "userId.cannot.be.empty")
-    @ApiModelProperty("用户id")
-    private Long userId;
+//    @NotNull(message = "userId.cannot.be.empty")
+//    @ApiModelProperty("用户id")
+//    private Long userId;
 
     @NotBlank(message = "email.cannot.be.empty")
     @ApiModelProperty("邮箱")
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 211fe4a8..e92d0149 100644
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -281,13 +281,15 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
 
     @Override
     public Boolean bindEmail(AccountBindEmailDTO accountBindEmailDTO) {
-        Account account = baseMapper.selectById(accountBindEmailDTO.getUserId());
+//        Account account = baseMapper.selectById(accountBindEmailDTO.getUserId());
+        AuthPrincipalVo userHolder = UserContext.getUserHolder();
+        Account account = accountMapper.selectById(userHolder.getId());
         if (Objects.isNull(account)) {
             throw new BusinessException("userName.does.not.exist", ResultEnum.PROMPT.getCode());
         }
-        if (StringUtils.isNotBlank(account.getUserEmail())) {
-            throw new BusinessException("user.has.bound.mailbox");
-        }
+//        if (StringUtils.isNotBlank(account.getUserEmail())) {
+//            throw new BusinessException("user.has.bound.mailbox");
+//        }
         //校验邮箱验证码
         String verifyCode = LocalCacheUtils.getVerifyCodeCache(AuthenticationOperationTypeEnum.BIND_MAILBOX.name() + "_" + accountBindEmailDTO.getUserEmail());
         if (StringUtils.isBlank(verifyCode)) {
@@ -297,7 +299,8 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
             throw new BusinessException("verification.code.error", ResultEnum.PROMPT.getCode());
         }
         //绑定
-        updatePwdByUserId(accountBindEmailDTO.getUserEmail(), accountBindEmailDTO.getUserId());
+        account.setUserEmail(accountBindEmailDTO.getUserEmail());
+//        updatePwdByUserId(accountBindEmailDTO.getUserEmail(), accountBindEmailDTO.getUserId());
         return Boolean.TRUE;
     }