From 1092be44f68213b8fc78be0b2a78b9425aa39689 Mon Sep 17 00:00:00 2001 From: liux <963924687@qq.com> Date: Tue, 9 Dec 2025 14:10:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E5=AF=BC=E5=85=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/AccImportOperationWalletPreCheckVO.java | 2 +- .../canteen/core/account/service/impl/AccSubServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccImportOperationWalletPreCheckVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccImportOperationWalletPreCheckVO.java index 2bd25de..d3db930 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccImportOperationWalletPreCheckVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccImportOperationWalletPreCheckVO.java @@ -23,7 +23,7 @@ public class AccImportOperationWalletPreCheckVO { private List errVOList; @ApiModelProperty("校验无效用户信息集合") private List invalidVOList; - + private List accInfoVOList; private List> sucVoListMap; @ApiModelProperty("操作金额") private BigDecimal amount; 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 58e8547..8496831 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 @@ -493,6 +493,7 @@ public class AccSubServiceImpl implements AccSubService { java.util.Map userCodeAmountMap = accImportDTOList.stream() .collect(Collectors.toMap(AccImportDTO::getUserCode, AccImportDTO::getAmount, (v1, v2) -> v1)); List accInfoVOList = accInfoService.queryAccInfoByUserCodes(userCodes); + List accInfoDetailsVOList = new ArrayList<>(); if (CollUtil.isEmpty(accInfoVOList)) { throw new ServiceException("批量补贴查询到的用户为空"); } @@ -507,6 +508,7 @@ public class AccSubServiceImpl implements AccSubService { Map maps = new HashMap<>(); maps.put(accInfo.getUserId(),userCodeAmountMap.get(accInfo.getUserCode()).movePointRight(2)); sucVoListMap.add(maps); + accInfoDetailsVOList.add(accInfo); } catch (Exception ex) { errVOList.add(createErrorVO(accInfo, userCodeAmountMap.get(accInfo.getUserCode()).movePointRight(2), ex.getMessage())); } @@ -515,7 +517,7 @@ public class AccSubServiceImpl implements AccSubService { java.util.Set mainUserCodes = accInfoVOList.stream() .map(AccInfoDetailsVO::getUserCode) .collect(Collectors.toSet()); -// 找出次集合中不在主集合中的元素 + // 找出次集合中不在主集合中的元素 List newCollection = accImportDTOList.stream() .filter(vo -> !mainUserCodes.contains(vo.getUserCode())) .collect(Collectors.toList()); @@ -536,6 +538,7 @@ public class AccSubServiceImpl implements AccSubService { result.setInvalidVOList(errorVOS); result.setValidUserIdList(sucVoList); result.setSucVoListMap(sucVoListMap); + result.setAccInfoVOList(accInfoDetailsVOList); BigDecimal amount = accImportDTOList.stream() .map(AccImportDTO::getAmount) .reduce(BigDecimal.ZERO, BigDecimal::add);