From ab303cfeef7aa82bff941a353b0fec1ac62edacb Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Mon, 13 Jan 2025 10:55:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=82=AE=E7=AE=B1=E6=97=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BD=E5=AE=B6=E3=80=81=E8=81=8C=E4=B8=9A?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/model/dto/AccountBindEmailDTO.java    | 8 --------
 src/main/java/com/ai/da/model/dto/EmailSendDTO.java      | 6 ++++++
 .../java/com/ai/da/service/impl/AccountServiceImpl.java  | 9 +++++++++
 3 files changed, 15 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 67394ebf..b5559769 100644
--- a/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java
+++ b/src/main/java/com/ai/da/model/dto/AccountBindEmailDTO.java
@@ -21,12 +21,4 @@ public class AccountBindEmailDTO {
     @NotBlank(message = "emailVerifyCode.cannot.be.empty")
     @ApiModelProperty("邮箱验证码")
     private String emailVerifyCode;
-
-    @NotBlank(message = "country cannot be empty" )
-    @ApiModelProperty("国家")
-    private String country;
-
-    @NotBlank(message = "occupation cannot be empty")
-    @ApiModelProperty("职业")
-    private String occupation;
 }
diff --git a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java
index eed614bb..9a111e87 100644
--- a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java
+++ b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java
@@ -21,4 +21,10 @@ public class EmailSendDTO {
     @ApiModelProperty("异常ip")
     private String ip;
 
+    @ApiModelProperty("国家")
+    private String country;
+
+    @ApiModelProperty("职业")
+    private String occupation;
+
 }
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 58c1a93a..4dc03dbf 100644
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -418,6 +418,15 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                 }
                 result = SendEmailUtil.send(emailSendDTO.getEmail(), null,
                         SendEmailUtil.BIND_MAILBOX_TEMPLATE_ID, randomVerifyCode);
+
+                if (!StringUtil.isNullOrEmpty(emailSendDTO.getCountry()) || !StringUtil.isNullOrEmpty(emailSendDTO.getOccupation())){
+                    Long accountId = UserContext.getUserHolder().getId();
+                    Account account = baseMapper.selectById(accountId);
+                    account.setCountry(emailSendDTO.getCountry());
+                    account.setOccupation(emailSendDTO.getOccupation());
+                    baseMapper.updateById(account);
+                }
+
                 break;
             case CHANGE_MAILBOX:
                 result = SendEmailUtil.send(emailSendDTO.getEmail(), null,