update m2pool 注销用户接口相关查询新增del_flag条件，开启注销用户谷歌验证

m2pool-auth/src/main/java/com/m2pool/auth/service/SysLoginService.java

@@ -591,10 +591,9 @@ public class SysLoginService {
             throw new ServiceException("验证码未获取或已过期，请重新获取验证码");
         }
         R<Boolean> booleanR1 = remoteUserService.checkGoogleCode(closeAccountVo, SecurityConstants.INNER);
-        System.out.println("谷歌验证码"+booleanR1);
-        //if(booleanR1 == null || !booleanR1.getData()){
-        //    throw new ServiceException("谷歌验证码错误");
-        //}
+        if(booleanR1 == null || !booleanR1.getData()){
+            throw new ServiceException("谷歌验证码错误");
+        }
 
         R<LoginUser> userInfo = remoteUserService.getUserInfo(SecurityUtils.getUsername(), SecurityConstants.INNER);
         if (R.FAIL == userInfo.getCode()) {

m2pool-modules/m2pool-pool/src/main/resources/mapper/pool/GoogleAuthMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             google_auth = #{info.secret},
             google_status = #{info.status},
             update_time = sysdate()
-        where user_name = #{info.email}
+        where user_name = #{info.email} and del_flag = 0
     </update>
 
     <select id="checkIfBindByEmail" resultType="java.lang.Boolean">
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from
             sys_user
         where
-            email = #{email}
+            email = #{email} AND del_flag = 0
         limit 1
     </select>
 

m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/service/impl/SysUserServiceImpl.java

@@ -399,14 +399,10 @@ public class SysUserServiceImpl implements SysUserService {
         }
 
         //没有绑定谷歌验证器 校验直接通过
-        if(StringUtils.isBlank(info.getSecret())){
+        if(StringUtils.isBlank(info.getSecret()) || info.getStatus() == 0){
             return true;
         }
 
-        //没有绑定谷歌验证器 校验直接通过
-        if(info.getStatus() == 0){
-            return true;
-        }
 
         if(GoogleAuthenticator.checkCode(info.getSecret(), code, System.currentTimeMillis())){
             return true;

m2pool-modules/m2pool-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from
             sys_user
         where
-            user_name = #{email}
+            user_name = #{email} AND del_flag = '0'
         limit 1
     </select>
     <select id="getCSList" resultType="com.m2pool.system.api.entity.SysUser">