From 059bd787c7329c5033e45e71d0866f41debb5f96 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Tue, 29 Apr 2025 09:48:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/android/UserMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a541356..0978245 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 @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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 - where ai.del_flag = '2' + where ai.del_flag = '0' AND su.update_time >= #{time} - INTERVAL 5 SECOND; From 3bb59100dfd12b7224f8c8533acb4647e4a34bae Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 29 Apr 2025 09:54:46 +0800 Subject: [PATCH 2/2] 5854 --- .../com/bonus/canteen/core/account/mapper/AccInfoMapper.java | 3 ++- .../canteen/core/account/service/impl/AccInfoServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java index 5308749..259233e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java @@ -73,7 +73,8 @@ public interface AccInfoMapper extends BaseMapper { List queryAccInfoDetails(@Param("accountInfoQueryParam") AccountInfoQueryParam accountInfoQueryParam, @Param("encryptedSearchValue") String encryptedSearchValue); - AccInfoDetailsVO queryAccInfoBalanceSum(@Param("accountInfoQueryParam") AccountInfoQueryParam accountInfoQueryParam); + AccInfoDetailsVO queryAccInfoBalanceSum(@Param("accountInfoQueryParam") AccountInfoQueryParam accountInfoQueryParam, + @Param("encryptedSearchValue") String encryptedSearchValue); void updateAccInfoEndDateByUserId(LocalDate endDate, List userIds, String updateBy); List queryAccInfoByUserIds(@Param("userIds") List userIds); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java index a354a8c..000f944 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java @@ -309,10 +309,11 @@ public class AccInfoServiceImpl implements IAccInfoService { } public AccInfoDetailsVO queryAccInfoBalanceSum(AccountInfoQueryParam accountInfoQueryParam) { + String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(accountInfoQueryParam.getSearchValue()); if(CollUtil.isEmpty(accountInfoQueryParam.getAccStatusList())) { accountInfoQueryParam.setAccStatusList(AccStatusEnum.getAllKeys()); } - return accInfoMapper.queryAccInfoBalanceSum(accountInfoQueryParam); + return accInfoMapper.queryAccInfoBalanceSum(accountInfoQueryParam, encryptedSearchValue); } @Transactional(rollbackFor = {Exception.class})