From 1ee307498effaf1b30872cc94e4e41da5245d068 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 13 一月 2025 16:20:24 +0800 Subject: [PATCH] 12.18 --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 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 5b2d63d..d0a3cd0 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 @@ -62,18 +62,6 @@ ShopBalanceStatement shopBalanceStatement = new ShopBalanceStatement(); shopBalanceStatement.setType(1); - R<List<ShopBalanceStatement>> r; - try { - r = shopClient.getShopBalanceStatementList(shopBalanceStatement); - } catch (Exception e) { - log.error("获取店铺余额对账单列表时出错", e); - return null; - } - - if (R.isError(r)) { - return null; - } - List<BalanceChangeRecord> balanceChangeRecordList = this.baseMapper.selectBalanceChangeRecordList(balanceChangeRecord); List<WalletStatisticsDetail> walletStatisticsDetailList = new ArrayList<>(); for (BalanceChangeRecord changeRecord : balanceChangeRecordList) { @@ -98,8 +86,6 @@ throw new ServiceException("页面参数无效"); } - List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex); - Map<Integer, BigDecimal> shopCommissionMap = walletStatisticsDetailList.stream() .collect(Collectors.groupingBy( @@ -115,14 +101,15 @@ BigDecimal totalWithdraw = shopCommissionMap.get(2); BigDecimal totalShopWithdraw = shopCommissionMap.get(7); + List<WalletStatisticsDetail> walletStatisticsDetailList2 = walletStatisticsDetailList.subList(fromIndex, toIndex); WalletStatistics walletStatistics = new WalletStatistics(); - Page<WalletStatisticsDetail> page1 = new Page<>(); - page1.setRecords(walletStatisticsDetailList2); - page1.setTotal(walletStatisticsDetailList.size()); - page1.setCurrent(current); - page1.setSize(size); - walletStatistics.setPage(page1); + Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>(); + 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); -- Gitblit v1.7.1