From 758c1aabbb5a1434447fc0c8d81c1941379f3752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 2 Jan 2025 15:48:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=9E=E5=90=8D=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/app/AppController.java     | 68 +++++++++----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppController.java b/src/main/java/com/sqx/modules/app/controller/app/AppController.java
index f945bcd8..88857ac3 100644
--- a/src/main/java/com/sqx/modules/app/controller/app/AppController.java
+++ b/src/main/java/com/sqx/modules/app/controller/app/AppController.java
@@ -101,67 +101,65 @@ public class AppController {
         UserInfo userInfo = userInfoService.getByUserId(userId);
         UserEntity userEntity = userService.getById(userId);
 
-        int count = userService.count(new QueryWrapper<UserEntity>()
-                .ne("user_id", userId)
-                .eq("zhi_fu_bao_name", certName)
-                .eq("zhi_fu_bao", zhiFuBao));
-
-        if (StrUtil.isNotBlank(zhiFuBao) && count > 0) {
-            return Result.error("一个支付宝账号仅可绑定一个用户");
-        }
-
+        String errMsg = null;
         if (StrUtil.isNotBlank(zhiFuBao)) {
+            int count = userService.count(new QueryWrapper<UserEntity>()
+                    .ne("user_id", userId)
+                    .eq("zhi_fu_bao_name", certName)
+                    .eq("zhi_fu_bao", zhiFuBao));
+            if (count > 0) {
+                errMsg = "支付宝信息修改失败: 一个支付宝账号仅可绑定一个用户";
+            }
             if (StrUtil.isNotBlank(userInfo.getCertName()) && !certName.equals(userInfo.getCertName())) {
-                return Result.error("姓名与实名认证信息不相符");
+                errMsg = "支付宝信息修改失败: 姓名与实名认证信息不相符";
             }
 
             if (!DataLimitUtil.isAccessAllowed(zhiFuBao+certName,  Integer.parseInt(commonRepository.findOne(924).getValue()), "month")) {
-                return Result.error("修改失败,相同支付宝账号每月可绑定次数已用完");
+                errMsg = "支付宝信息修改失败: 相同支付宝账号每月可绑定次数已用完";
             }
 
             if (!ApiAccessLimitUtil.isAccessAllowed(userId.toString(), "updateZFB", Integer.parseInt(commonRepository.findOne(925).getValue()), "month")) {
-                return Result.error("每月可修改次数已用完,请联系管理员");
-            }
-        }
-
-
-        if (StrUtil.isNotBlank(certNum)) {
-            if (StrUtil.isNotBlank(userEntity.getZhiFuBaoName()) && !certName.equals(userEntity.getZhiFuBaoName())) {
-                return Result.error("姓名与绑定支付宝信息不相符");
-            }
-            if (!IdcardUtil.isValidCard(certNum)) {
-                throw new SqxException("身份证号码有误");
+                errMsg = "支付宝信息修改失败: 每月可修改次数已用完,请联系管理员";
             }
 
-            Integer idCount = userInfoService.countCertCount(certName, certNum);
-            if (idCount > 1) {
-                throw new SqxException("此实名信息已存在");
-            }
-
-            if (!ApiAccessLimitUtil.isAccessAllowed(String.valueOf(userId), "updateAuthCertInfo", 1, "month")) {
-                return Result.error("每月可修改次数已用完,请联系管理员");
-            }
-        }
-
-
-        if (StrUtil.isNotBlank(zhiFuBao)) {
             userEntity.setZhiFuBao(zhiFuBao);
             userEntity.setZhiFuBaoName(certName);
             userService.updateById(userEntity);
         }
 
+
         if (StrUtil.isNotBlank(certNum)) {
+            if (StrUtil.isNotBlank(userEntity.getZhiFuBaoName()) && !certName.equals(userEntity.getZhiFuBaoName())) {
+                errMsg = "实名修改失败: 姓名与绑定支付宝信息不相符";
+            }
+            if (!IdcardUtil.isValidCard(certNum)) {
+                errMsg = "实名修改失败: 身份证号码有误";
+            }
+
+            Integer idCount = userInfoService.countCertCount(certName, certNum);
+            if (idCount > 1) {
+                errMsg = "实名修改失败: 此实名信息已存在";
+            }
+
+            if (!ApiAccessLimitUtil.isAccessAllowed(String.valueOf(userId), "updateAuthCertInfo", 1, "month")) {
+                errMsg = "实名修改失败: 每月可修改次数已用完,请联系管理员";
+            }
+
             try {
                 aliService.authCertNo(certName, certNum);
             }catch (Exception e) {
                 ApiAccessLimitUtil.removeKey(String.valueOf(userId), "updateAuthCertInfo");
-                return Result.error(e.getMessage());
+                errMsg = "实名修改失败: " + e.getMessage();
             }
             userInfo.setCertName(certName);
             userInfo.setCertNo(certNum);
             userInfo.setUpdateTime(DateUtil.date());
             userInfoService.updateById(userInfo);
         }
+
+        if (errMsg != null) {
+            return Result.error(errMsg);
+        }
         return Result.success();
         // 去除首绑支付宝奖励
 //        if (bool && isFirstBind) {