bonus
/
Bonus-Cloud-JYY-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-04-29 10:09:00 +08:00
parent 3a160c97f8 1c45e9862a
commit 94daf19822
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java
View File

@ -73,7 +73,8 @@ public interface AccInfoMapper extends BaseMapper<AccInfo> {
List<AccInfoDetailsVO> 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<Long> userIds, String updateBy);
List<AccInfoDetailsVO> queryAccInfoByUserIds(@Param("userIds") List<Long> userIds);

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java
View File

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

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/android/UserMapper.xml
View File

@ -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'
<if test="type == 'user'">
<if test="time != null and time != ''">
AND su.update_time >= #{time} - INTERVAL 5 SECOND;