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

---
 src/main/java/com/ai/da/common/utils/SendEmailUtil.java   | 3 ++-
 src/main/java/com/ai/da/controller/AccountController.java | 5 +++--
 src/main/java/com/ai/da/service/AccountService.java       | 5 +++--
 .../java/com/ai/da/service/impl/AccountServiceImpl.java   | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
index 9dd76934..048f65af 100644
--- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
+++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
@@ -73,7 +73,8 @@ public class SendEmailUtil {
     /**
      * 绑定邮箱模板id
      */
-    public static Long BIND_MAILBOX_TEMPLATE_ID = 45619L;
+//    public static Long BIND_MAILBOX_TEMPLATE_ID = 45619L;
+    public static Long BIND_MAILBOX_TEMPLATE_ID = 132754L;
 
     public static Long CHANGE_MAILBOX_TEMPLATE_ID = 128210L;
 
diff --git a/src/main/java/com/ai/da/controller/AccountController.java b/src/main/java/com/ai/da/controller/AccountController.java
index a16337ce..9d2b0f4d 100644
--- a/src/main/java/com/ai/da/controller/AccountController.java
+++ b/src/main/java/com/ai/da/controller/AccountController.java
@@ -4,6 +4,7 @@ import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.entity.Account;
+import com.ai.da.mapper.primary.entity.AccountExtend;
 import com.ai.da.mapper.primary.entity.TrialOrder;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.AccountLoginVO;
@@ -313,13 +314,13 @@ public class AccountController {
 
     @GetMapping("/bindGoogle")
     @ApiOperation(value = "绑定谷歌")
-    public Response<Boolean> bindGoogle(@RequestParam("credential") String credential) {
+    public Response<AccountExtend> bindGoogle(@RequestParam("credential") String credential) {
         return Response.success(accountService.bindGoogle(credential));
     }
 
     @GetMapping("/bindWeChat")
     @ApiOperation(value = "绑定微信")
-    public Response<Boolean> bindWeChat(@RequestParam("code") String code) {
+    public Response<AccountExtend> bindWeChat(@RequestParam("code") String code) {
         return Response.success(accountService.bindWeChat(code));
     }
 
diff --git a/src/main/java/com/ai/da/service/AccountService.java b/src/main/java/com/ai/da/service/AccountService.java
index 6ecb4f0a..07944fcd 100644
--- a/src/main/java/com/ai/da/service/AccountService.java
+++ b/src/main/java/com/ai/da/service/AccountService.java
@@ -2,6 +2,7 @@ package com.ai.da.service;
 
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.mapper.primary.entity.Account;
+import com.ai.da.mapper.primary.entity.AccountExtend;
 import com.ai.da.mapper.primary.entity.GoogleUser;
 import com.ai.da.mapper.primary.entity.TrialOrder;
 import com.ai.da.model.dto.*;
@@ -210,9 +211,9 @@ public interface AccountService extends IService<Account> {
 
     AccountLoginVO getAccountDetail();
 
-    Boolean bindGoogle(String credential);
+    AccountExtend bindGoogle(String credential);
 
-    Boolean bindWeChat(String code);
+    AccountExtend bindWeChat(String code);
 
     Boolean unbindWeChat();
 
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 e92d0149..054ab718 100644
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -2432,7 +2432,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     }
 
     @Override
-    public Boolean bindGoogle(String credential) {
+    public AccountExtend bindGoogle(String credential) {
         try {
             // 配置 Google ID Token 验证器
             GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder(
@@ -2466,7 +2466,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                 accountExtendInsert.setAccountId(authPrincipalVo.getId());
                 accountExtendMapper.insert(accountExtendInsert);
 
-                return Boolean.TRUE;
+                return accountExtendInsert;
             } else {
                 throw new IllegalArgumentException("Invalid ID token.");
             }
@@ -2478,7 +2478,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     }
 
     @Override
-    public Boolean bindWeChat(String code) {
+    public AccountExtend bindWeChat(String code) {
         // 1. 获取 access_token 和 openid
         JSONObject accessTokenResponse = getAccessTokenFromWeChat(code);
         String accessToken = accessTokenResponse.getString("access_token");
@@ -2508,7 +2508,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         accountExtendInsert.setAccountId(authPrincipalVo.getId());
         accountExtendMapper.insert(accountExtendInsert);
 
-        return Boolean.TRUE;
+        return accountExtendInsert;
     }
 
     @Override