From 4cb02390ed6168d59efe40be3e7be773db6e0f82 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Fri, 25 Apr 2025 17:33:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/android/service/impl/UserServiceImpl.java   | 5 +++++
 .../java/com/bonus/canteen/core/android/vo/UserInfoVo.java   | 4 ++++
 .../src/main/resources/mapper/android/UserMapper.xml         | 4 +++-
 3 files changed, 12 insertions(+), 1 deletion(-)

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 a584d02..7f720d5 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
@@ -5,6 +5,7 @@ import com.bonus.canteen.core.android.mapper.UserMapper;
 import com.bonus.canteen.core.android.service.UserService;
 import com.bonus.canteen.core.android.vo.UserInfoVo;
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.common.houqin.utils.SM4EncryptUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +27,9 @@ public class UserServiceImpl implements UserService {
         List<UserInfoVo> moneyList = mapper.getMoneyList();
         if (!list.isEmpty()){
             list.forEach(userInfoVo -> {
+                if (userInfoVo.getPhone().length() != 11){
+                    userInfoVo.setPhone(SM4EncryptUtils.sm4Decrypt(userInfoVo.getPhone()));
+                }
                 UserInfoVo money = moneyList.stream().filter(moneyVo -> moneyVo.getUserId().equals(userInfoVo.getUserId())).findFirst().orElse(null);
                 if (money != null){
                     userInfoVo.setPersonalWalletBalance(money.getPersonalWalletBalance());
@@ -38,4 +42,5 @@ public class UserServiceImpl implements UserService {
         }
         return AjaxResult.success(list);
     }
+
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java
index 21e989f..2097350 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/vo/UserInfoVo.java
@@ -13,6 +13,10 @@ public class UserInfoVo {
 
     private String userName;
 
+    private String phone;
+
+    private String loginType;
+
     private String accId;
     /**
      * 卡号
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 6a56aa4..35a08e6 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
@@ -10,7 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ac.acc_id as accId,
             ac.card_num as cardNum,
             ac.serial_num as serialNum,
-            ai.acc_status as accStatus
+            ai.acc_status as accStatus,
+            su.phone as phone,
+            su.login_type as loginType
         from sys_user su
         left join acc_card ac on ac.user_id = su.user_id
         left join acc_info ai on ai.user_id = su.user_id