From 164cf9b4c96835e1acd3aa482f2ba9e197cb02a5 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 8 May 2025 16:53:48 +0800 Subject: [PATCH] =?UTF-8?q?5847=20=E4=B8=AA=E4=BA=BA=E8=A1=A5=E8=B4=B4?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=89=B9=E9=87=8F=E8=A1=A5=E8=B4=B4?= =?UTF-8?q?=E5=90=8E=E8=A1=A5=E8=B4=B4=E9=A2=84=E8=A7=88=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9C=AA=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../account/domain/vo/AccBatchOperationWallerErrorVO.java | 4 ++++ .../canteen/core/account/service/impl/AccSubServiceImpl.java | 4 +++- .../src/main/resources/mapper/account/AccInfoMapper.xml | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) 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