From c623837d52195a55084ab3a69bde6f3625fb7e91 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Tue, 13 Jan 2026 16:47:04 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=A7=A3=E5=86=B3=E8=B0=B7=E6=AD=8C?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E5=BC=80=E5=90=AF=E7=A7=98=E9=92=A5=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../m2pool/lease/service/impl/LeaseUserServiceImpl.java    | 7 ++-----
 src/main/resources/mapper/lease/LeaseUserMapper.xml        | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java
index 8b89440..05f3ed5 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseUserServiceImpl.java
@@ -1,6 +1,7 @@
 package com.m2pool.lease.service.impl;
 
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
@@ -1045,11 +1046,7 @@ public class LeaseUserServiceImpl extends ServiceImpl<LeaseUserMapper, LeaseUser
 
         // 根据邮箱查询是否已绑定
         UserGoogleAuthInfo info = leaseUserMapper.getUserInfoByEmail(email);
-
-        //已绑定 正常走关闭谷歌验证流程
-        //校验gcode
-        boolean gResult = GoogleAuthenticator.checkCode(info.getSecret(), vo.getGCode(), System.currentTimeMillis());
-        if(!gResult){
+        if(!GoogleAuthenticator.checkCode(info.getSecret(), vo.getGCode(), System.currentTimeMillis())){
             return Result.fail("谷歌验证码错误");
         }
         //校验邮箱验证码
diff --git a/src/main/resources/mapper/lease/LeaseUserMapper.xml b/src/main/resources/mapper/lease/LeaseUserMapper.xml
index f5a1178..022cddf 100644
--- a/src/main/resources/mapper/lease/LeaseUserMapper.xml
+++ b/src/main/resources/mapper/lease/LeaseUserMapper.xml
@@ -58,9 +58,8 @@
     <update id="closeGoogleAuthenticator">
         update lease_user
         set
-            google_auth = '',
             google_status = 2
-        where user_id = #{info.email}
+        where user_id = #{info.email} and del = false
     </update>
 
     <update id="openGoogleAuthenticator">