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

5847 个人补贴模块，批量补贴后补贴预览数据未展示

This commit is contained in:
gaowdong 2025-05-08 16:53:48 +08:00
parent 402c5f2e1b
commit 164cf9b4c9
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccBatchOperationWallerErrorVO.java
View File

@ -10,6 +10,10 @@ public class AccBatchOperationWallerErrorVO {
private Long userId; private Long userId;
@ApiModelProperty("用户姓名") @ApiModelProperty("用户姓名")
private String nickName; private String nickName;
@ApiModelProperty("组织全名")
private String deptFullName;
@ApiModelProperty("用户类型")
private Integer userType;
@ApiModelProperty("用户手机号") @ApiModelProperty("用户手机号")
private String phoneNumber; private String phoneNumber;
@ApiModelProperty("充值金额") @ApiModelProperty("充值金额")

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

@ -360,7 +360,9 @@ public class AccSubServiceImpl implements AccSubService {
AccBatchOperationWallerErrorVO errVO = new AccBatchOperationWallerErrorVO(); AccBatchOperationWallerErrorVO errVO = new AccBatchOperationWallerErrorVO();
errVO.setUserId(accInfo.getUserId()); errVO.setUserId(accInfo.getUserId());
errVO.setNickName(accInfo.getNickName()); errVO.setNickName(accInfo.getNickName());
errVO.setPhoneNumber(accInfo.getPhoneNumber()); errVO.setDeptFullName(accInfo.getDeptFullName());
errVO.setUserType(accInfo.getUserType());
errVO.setPhoneNumber(SM4EncryptUtils.sm4Decrypt(accInfo.getPhoneNumber()));
errVO.setAmount(amount); errVO.setAmount(amount);
errVO.setErrorMessage(errMsg); errVO.setErrorMessage(errMsg);
return errVO; return errVO;

4
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml
View File

@ -517,7 +517,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ai.acc_status, ai.acc_status,
su.nick_name, su.nick_name,
su.phonenumber, su.phonenumber,
su.dept_id su.dept_id,
co.dept_full_name,
su.user_type
FROM acc_info ai FROM acc_info ai
LEFT JOIN sys_user su ON su.user_id = ai.user_id LEFT JOIN sys_user su ON su.user_id = ai.user_id
LEFT JOIN sys_dept co ON co.dept_id = su.dept_id LEFT JOIN sys_dept co ON co.dept_id = su.dept_id