From d6c23f8c5df4b3413f5c262953f319a09877dfd2 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 16 一月 2025 14:30:17 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java index 8f7c712..0baa978 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java @@ -104,7 +104,6 @@ } - Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList.stream() .collect(Collectors.groupingBy( WalletStatisticsDetail::getChangeType, @@ -121,20 +120,20 @@ List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex); for (WalletStatisticsDetail changeRecord : walletStatisticsDetailList2) { - if (changeRecord.getChangeType().equals(1)||changeRecord.getChangeType().equals(3)||changeRecord.getChangeType().equals(4)||changeRecord.getChangeType().equals(6)){ - changeRecord.setChangeAmountString("+¥"+changeRecord.getChangeAmount()); - } else{ - changeRecord.setChangeAmountString("-¥"+changeRecord.getChangeAmount()); + if (changeRecord.getChangeType().equals(1) || changeRecord.getChangeType().equals(3) || changeRecord.getChangeType().equals(4) || changeRecord.getChangeType().equals(6)) { + changeRecord.setChangeAmountString("+¥" + changeRecord.getChangeAmount()); + } else { + changeRecord.setChangeAmountString("-¥" + changeRecord.getChangeAmount()); + } + walletStatisticsDetailPage.setCurrent(current); + walletStatisticsDetailPage.setSize(size); + walletStatisticsDetailPage.setTotal(walletStatisticsDetailList.size()); + walletStatisticsDetailPage.setRecords(walletStatisticsDetailList2); + walletStatistics.setPage(walletStatisticsDetailPage); + walletStatistics.setTotalRecharge(totalRecharge); + walletStatistics.setTotalWithdraw(totalWithdraw); + walletStatistics.setTotalShopWithdraw(totalShopWithdraw); } - walletStatisticsDetailPage.setCurrent(current); - walletStatisticsDetailPage.setSize(size); - walletStatisticsDetailPage.setTotal(walletStatisticsDetailList.size()); - walletStatisticsDetailPage.setRecords(walletStatisticsDetailList2); - walletStatistics.setPage(walletStatisticsDetailPage); - walletStatistics.setTotalRecharge(totalRecharge); - walletStatistics.setTotalWithdraw(totalWithdraw); - walletStatistics.setTotalShopWithdraw(totalShopWithdraw); return walletStatistics; } - } -- Gitblit v1.7.1