From a817425d3e4a5b4f9e367c8724cda2c00c2380d6 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 8 Apr 2025 18:46:14 +0800 Subject: [PATCH] balance --- .../account/service/impl/AccInfoServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java index f62f036..3872b5f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java @@ -356,10 +356,12 @@ public class AccInfoServiceImpl implements IAccInfoService { protected void setAccInfoVODetailList(AccInfoVo accInfoVo, List walletInfoList) { -// if (ObjectUtil.isNotEmpty(walletInfoList)) { -// accInfoVo.setWalletBal(walletInfoList.stream().filter(o -> o.getWalletId().intValue() == AccWalletIdEnum.WALLET.getKey()).mapToLong(AccWalletInfo::getWalletBal).sum()); -// accInfoVo.setSubsidyBal(walletInfoList.stream().filter(o -> o.getWalletId().intValue() == AccWalletIdEnum.SUBSIDY.getKey()).mapToLong(AccWalletInfo::getWalletBal).sum()); -// accInfoVo.setAccAllBal(accInfoVo.getWalletBal() + accInfoVo.getSubsidyBal()); -// } + if (ObjectUtil.isNotEmpty(walletInfoList)) { + accInfoVo.setWalletBal(walletInfoList.stream().filter(o -> o.getWalletId().intValue() == AccWalletIdEnum.WALLET.getKey()) + .map(AccWalletInfo::getWalletBal).reduce(BigDecimal.ZERO, BigDecimal::add)); + accInfoVo.setSubsidyBal(walletInfoList.stream().filter(o -> o.getWalletId().intValue() == AccWalletIdEnum.SUBSIDY.getKey()) + .map(AccWalletInfo::getWalletBal).reduce(BigDecimal.ZERO, BigDecimal::add)); + accInfoVo.setAccAllBal(accInfoVo.getWalletBal().add(accInfoVo.getSubsidyBal())); + } } }