From 9282ef6adadd4914239c340b32b089089df2d097 Mon Sep 17 00:00:00 2001
From: sangchengzhi <2305486879@qq.com>
Date: Thu, 5 Mar 2026 08:45:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=87=E9=9D=A2=E7=B1=BB?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3bug=EF=BC=8C=E5=8A=A0=E5=85=A5spring=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/CoolRequestSetting.xml                             | 3 +--
 .../java/com/guahao/h5/user/mapper/UserCardMapper.java   | 2 +-
 .../java/com/guahao/h5/user/service/UserCardService.java | 2 +-
 .../java/com/guahao/h5/user/service/UserService.java     | 9 +++++----
 .../java/com/guahao/h5/yb/controller/YbController.java   | 4 ++--
 src/main/resources/application.properties                | 2 +-
 .../resources/mybatis/mapper/user/UserCardMapper.xml     | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.idea/CoolRequestSetting.xml b/.idea/CoolRequestSetting.xml
index 6793e1e..996fdd3 100644
--- a/.idea/CoolRequestSetting.xml
+++ b/.idea/CoolRequestSetting.xml
@@ -3,9 +3,8 @@
   <component name="CoolRequestSetting">
     <option name="serializePaths">
       <list>
-        <option value="C:\Users\Sang\.config\.cool-request\request\serialize\1bd30efc62b741008bc315a5b375dfce" />
-        <option value="C:\Users\Sang\.config\.cool-request\request\serialize\7c9ed71f67784c07ae7eca219e9a539a" />
         <option value="C:\Users\Sang\.config\.cool-request\request\serialize\e73208943ce7420d81abaa46dddeaa89" />
+        <option value="C:\Users\Sang\.config\.cool-request\request\serialize\3876892f78a44bb7a7008fd29db477eb" />
       </list>
     </option>
     <option name="projectCachePath" value="project-a9a67828-45d7-44aa-a811-3ecda9f37cac" />
diff --git a/src/main/java/com/guahao/h5/user/mapper/UserCardMapper.java b/src/main/java/com/guahao/h5/user/mapper/UserCardMapper.java
index b2cfbd3..4e07270 100644
--- a/src/main/java/com/guahao/h5/user/mapper/UserCardMapper.java
+++ b/src/main/java/com/guahao/h5/user/mapper/UserCardMapper.java
@@ -53,5 +53,5 @@ public interface UserCardMapper extends BaseMapper<UserCard> {
 
     List<UserCardVo> selectByPatientId(@Param("patientId") String patientId);
 
-    List<UserCard> selectByUserId(Integer userId);
+    List<UserCardVo> selectByUserId(Integer userId);
 }
diff --git a/src/main/java/com/guahao/h5/user/service/UserCardService.java b/src/main/java/com/guahao/h5/user/service/UserCardService.java
index be36e9e..6daca02 100644
--- a/src/main/java/com/guahao/h5/user/service/UserCardService.java
+++ b/src/main/java/com/guahao/h5/user/service/UserCardService.java
@@ -353,7 +353,7 @@ public class UserCardService {
         return userCardMapper.deleteUserCard(userId,id);
     }
 
-    public List<UserCard> selectByUserId(Integer userId) {
+    public List<UserCardVo> selectByUserId(Integer userId) {
         return userCardMapper.selectByUserId(userId);
     }
 }
diff --git a/src/main/java/com/guahao/h5/user/service/UserService.java b/src/main/java/com/guahao/h5/user/service/UserService.java
index 7dda7ef..a7012e6 100644
--- a/src/main/java/com/guahao/h5/user/service/UserService.java
+++ b/src/main/java/com/guahao/h5/user/service/UserService.java
@@ -7,6 +7,7 @@ import com.guahao.common.util.MD5Util;
 import com.guahao.common.util.VeDate;
 import com.guahao.h5.user.mapper.UserMapper;
 import com.guahao.h5.user.model.UserCard;
+import com.guahao.h5.user.model.UserCardVo;
 import com.guahao.h5.user.model.UserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -200,15 +201,15 @@ public class UserService {
     }
     public Boolean hasUser(Integer userId, String patientId) {
         //判断该id下是否有绑定所查的用户信息
-        List<UserCard> list = userCardService.selectByUserId(userId);
+        List<UserCardVo> list = userCardService.selectByUserId(userId);
 
         if (list == null || list.isEmpty()) {
             return false;
         }
 
         // 检查用户是否绑定了特定的就诊卡号
-        for (UserCard userCard : list) {
-            if (patientId.equals(userCard.getCard_no())) {
+        for (UserCardVo userCard : list) {
+            if (patientId.equals(userCard.getCardNo())) {
                 return true;
             }
         }
@@ -216,7 +217,7 @@ public class UserService {
         return false;
     }
 
-    public List<UserCard> queryUserCardsByUserId(Integer userId) {
+    public List<UserCardVo> queryUserCardsByUserId(Integer userId) {
         return userCardService.selectByUserId(userId);
     }
 }
diff --git a/src/main/java/com/guahao/h5/yb/controller/YbController.java b/src/main/java/com/guahao/h5/yb/controller/YbController.java
index 294ccd8..5088749 100644
--- a/src/main/java/com/guahao/h5/yb/controller/YbController.java
+++ b/src/main/java/com/guahao/h5/yb/controller/YbController.java
@@ -99,10 +99,10 @@ public class YbController {
                 String json = ybService.getPayAuthCode(qrcode,openid);
                 JSONObject jsonObject1 = JSON.parseObject(json);
                 String payAuthNo = jsonObject1.getString("pay_auth_no");
-                List<UserCard> cardList = userCardMapper.selectByUserId(uid);
+                List<UserCardVo> cardList = userCardMapper.selectByUserId(uid);
                 if (cardList.size() > 0){
                     cardList.forEach(vo -> {
-                        hsjcMapper.updatePayAuthNoList(payAuthNo,vo.getCard_no());
+                        hsjcMapper.updatePayAuthNoList(payAuthNo,vo.getCardNo());
                     });
                 }
                 IDVO vo =userCardMapper.queryUserCardDefaltByOpenid(openid);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6f9751e..7a5ba41 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=8089
-#server.servlet.context-path=/WGZH
+#server.servlet.context-path=/nxgzh
 #公众号配置
 wechat.AppId=wx45acd2b4907cb8f4
 wechat.AppSecret=895b90585c4698485c07e113711eac85
diff --git a/src/main/resources/mybatis/mapper/user/UserCardMapper.xml b/src/main/resources/mybatis/mapper/user/UserCardMapper.xml
index 5c62dd3..00ea491 100644
--- a/src/main/resources/mybatis/mapper/user/UserCardMapper.xml
+++ b/src/main/resources/mybatis/mapper/user/UserCardMapper.xml
@@ -152,7 +152,7 @@
         select  * from user_card where patient_id = #{patientId}   AND deleted = 0
     </select>
 
-    <select id="selectByUserId" resultType="com.guahao.h5.user.model.UserCard">
+    <select id="selectByUserId" resultType="com.guahao.h5.user.model.UserCardVo">
         select * from user_card where user_id = #{userId}  AND deleted = 0
     </select>