From a98998260a48a76a9c7351795097eca539d99f0e Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 8 Jul 2025 14:59:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/expert/controller/ExpertController.java | 17 ++++++++++++-----
 .../service/CaseplatformCaseService.java        |  7 ++++++-
 .../miniapp/controller/WxMaUserController.java  |  8 ++++++--
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertController.java
index 6277414..c59f55a 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertController.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/app/expert/controller/ExpertController.java
@@ -265,10 +265,13 @@ public class ExpertController {
             ExpertEntity expertVO = expertService.addExpert(expert);
             ExpertLoginVO expertLoginVO = SmartBeanUtil.copy(expertVO, ExpertLoginVO.class);
             return ResponseDTO.app_ok(expertLoginVO);
-        }else{
-            responseDTO.setMsg("账号未注册，请您注册后登陆");
-            return responseDTO;
         }
+
+        if (responseDTO.getMsg() == null){
+            responseDTO.setMsg("登录失败");
+        }
+
+        return responseDTO;
     }
 
     @NoNeedLogin
@@ -508,9 +511,13 @@ public class ExpertController {
 
             ExpertLoginVO expertLoginVO = SmartBeanUtil.copy(expertVO, ExpertLoginVO.class);
             return ResponseDTO.app_ok(expertLoginVO);
-        }else{
-            return responseDTO;
         }
+
+        if (responseDTO.getMsg() == null){
+            responseDTO.setMsg("登录失败");
+        }
+
+        return responseDTO;
     }
 
     @NoNeedLogin
diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java
index e98a980..a428ea1 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java
@@ -242,7 +242,7 @@ public class CaseplatformCaseService {
                 Row row = it.next();
 
                 // 跳过第一行/二行
-                if (rowNum++ <= 2) continue;
+                if (rowNum++ <= 1) continue;
 
                 // 判断整行是否为空
                 boolean isEmptyRow = true;
@@ -297,6 +297,11 @@ public class CaseplatformCaseService {
                         throw new BusinessException("处理失败: 存在非法病例 " + id);
                     }
 
+                    // 已经结算
+                    if (caseplatformCase.getSettlementFlag() == 1){
+                        continue;
+                    }
+
                     // 获取专家银行卡
                     LambdaQueryWrapper<CasePlatformBankEntity> queryWrapper = new LambdaQueryWrapper<>();
                     queryWrapper.eq(CasePlatformBankEntity::getExpertId, caseplatformCase.getExpertId());
diff --git a/sa-admin/src/main/java/net/lab1024/sa/admin/module/wx/miniapp/controller/WxMaUserController.java b/sa-admin/src/main/java/net/lab1024/sa/admin/module/wx/miniapp/controller/WxMaUserController.java
index c28ab1a..5148d07 100644
--- a/sa-admin/src/main/java/net/lab1024/sa/admin/module/wx/miniapp/controller/WxMaUserController.java
+++ b/sa-admin/src/main/java/net/lab1024/sa/admin/module/wx/miniapp/controller/WxMaUserController.java
@@ -192,9 +192,13 @@ public class WxMaUserController {
                 ExpertEntity expertVO = expertService.addExpert(expert);
                 ExpertLoginVO expertLoginVO = SmartBeanUtil.copy(expertVO, ExpertLoginVO.class);
                 return ResponseDTO.app_ok(expertLoginVO);
-            }else{
-                return responseDTO;
             }
+
+            if (responseDTO.getMsg() == null){
+                responseDTO.setMsg("登录失败");
+            }
+
+            return responseDTO;
         }catch (Exception e){
             e.printStackTrace();
             return ResponseDTO.userErrorParam();