From 11b71392f6773cdc3e0b432994dfcceaa31fbca7 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 5 Jun 2025 15:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E5=B1=8F=E6=9C=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BA=BA=E8=84=B8=E3=80=81=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/service/impl/UserServiceImpl.java | 27 ++++++++-------
 .../resources/mapper/android/FaceMapper.xml   |  5 ++-
 .../resources/mapper/android/UserMapper.xml   | 33 +++++++++----------
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/UserServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/UserServiceImpl.java
index 1174922..c1b7a82 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/UserServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/UserServiceImpl.java
@@ -31,18 +31,21 @@ public class UserServiceImpl implements UserService {
             return AjaxResult.success(new ArrayList<>());
         }
         List<UserInfoVo> moneyList = mapper.getMoneyList();
-        // 构建 userId 到 moneyVo 的映射，提升查找效率
-        Map<String, UserInfoVo> moneyMap = moneyList.stream().collect(Collectors.toMap(UserInfoVo::getUserId, vo -> vo, (a, b) -> a));
-        list.forEach(userInfoVo -> {
-            if (userInfoVo.getPhone().length() > PHONE_LENGTH) {
-                userInfoVo.setPhone(SM4EncryptUtils.sm4Decrypt(userInfoVo.getPhone()));
-            }
-            UserInfoVo money = moneyMap.get(userInfoVo.getUserId());
-            if (money != null) {
-                userInfoVo.setPersonalWalletBalance(money.getPersonalWalletBalance());
-                userInfoVo.setSubsidiesBalance(money.getSubsidiesBalance());
-            }
-        });
+        if (!moneyList.isEmpty()){
+            // 构建 userId 到 moneyVo 的映射，提升查找效率
+            Map<String, UserInfoVo> moneyMap = moneyList.stream().collect(Collectors.toMap(UserInfoVo::getUserId, vo -> vo, (a, b) -> a));
+            list.forEach(userInfoVo -> {
+                if (userInfoVo.getPhone().length() > PHONE_LENGTH) {
+                    userInfoVo.setPhone(SM4EncryptUtils.sm4Decrypt(userInfoVo.getPhone()));
+                }
+                UserInfoVo money = moneyMap.get(userInfoVo.getUserId());
+                if (money != null) {
+                    userInfoVo.setPersonalWalletBalance(money.getPersonalWalletBalance());
+                    userInfoVo.setSubsidiesBalance(money.getSubsidiesBalance());
+                }
+
+            });
+        }
         return AjaxResult.success(list);
     }
 
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/FaceMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/FaceMapper.xml
index 488c57b..a04cf40 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/FaceMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/FaceMapper.xml
@@ -11,8 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             face_state
         from user_face
         <where>
+            <if test="userId != null and userId != '' and userId != 0 and userId != '0'">
+                and user_id = #{userId}
+            </if>
             <if test="time != null and time != ''">
-                and update_time >= #{time} - INTERVAL 5 SECOND;
+                and update_time >= #{time} - INTERVAL 10 SECOND
             </if>
         </where>
     </select>
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
index 611efc3..5ad449c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
@@ -4,31 +4,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.android.mapper.UserMapper">
     <select id="getUserInfo" resultType="com.bonus.canteen.core.android.vo.UserInfoVo">
-        select
-            su.user_id as userId,
-            su.user_name as userName,
-            su.nick_name as nickName,
-            ac.account_id as accId,
-            '' as cardNum,
-            ac.serial_num as serialNum,
-            ai.account_status as accStatus,
-            su.phonenumber as phone,
-            su.login_type as loginType
+        select su.user_id        as userId,
+               su.user_name      as userName,
+               su.nick_name      as nickName,
+               ac.account_id     as accId,
+               ''                as cardNum,
+               ac.serial_num     as serialNum,
+               ai.account_status as accStatus,
+               su.phonenumber    as phone,
+               su.login_type     as loginType
         from sys_user su
-        left join account_card ac on ac.user_id = su.user_id
-        left join account_info ai on ai.user_id = su.user_id
+                 left join account_card ac on ac.user_id = su.user_id
+                 left join account_info ai on ai.user_id = su.user_id
         where ai.del_flag = '0'
-            <if test="userId != null and userId != '' and userId != 0 and userId != '0'">
-                AND su.user_id = #{userId}
-            </if>
+        <if test="userId != null and userId != '' and userId != 0 and userId != '0'">
+            AND su.user_id = #{userId}
+        </if>
         <if test="type == 'user'">
             <if test="time != null and time != ''">
-                AND su.update_time >= (#{time} - INTERVAL 5 SECOND)
+                AND su.update_time >= (#{time} - INTERVAL 10 SECOND)
             </if>
         </if>
         <if test="type == 'card'">
             <if test="time != null and time != ''">
-                AND ac.update_time >= (#{time} - INTERVAL 5 SECOND)
+                AND ac.update_time >= (#{time} - INTERVAL 10 SECOND)
             </if>
         </if>
     </select>