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}) 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;