diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccBatchOperationWallerErrorVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccBatchOperationWallerErrorVO.java index 2181d39..b5c8402 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccBatchOperationWallerErrorVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccBatchOperationWallerErrorVO.java @@ -10,6 +10,10 @@ public class AccBatchOperationWallerErrorVO { private Long userId; @ApiModelProperty("用户姓名") private String nickName; + @ApiModelProperty("组织全名") + private String deptFullName; + @ApiModelProperty("用户类型") + private Integer userType; @ApiModelProperty("用户手机号") private String phoneNumber; @ApiModelProperty("充值金额") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java index ae9244a..d4dd627 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccSubServiceImpl.java @@ -360,7 +360,9 @@ public class AccSubServiceImpl implements AccSubService { AccBatchOperationWallerErrorVO errVO = new AccBatchOperationWallerErrorVO(); errVO.setUserId(accInfo.getUserId()); 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.setErrorMessage(errMsg); return errVO; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml index f2ddb2d..a4ea6ba 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml @@ -517,7 +517,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ai.acc_status, su.nick_name, su.phonenumber, - su.dept_id + su.dept_id, + co.dept_full_name, + su.user_type FROM acc_info ai LEFT JOIN sys_user su ON su.user_id = ai.user_id LEFT JOIN sys_dept co ON co.dept_id = su.dept_id