From 955b0ea6a5219997345fc9812319ed961302cd88 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 17:02:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/BalanceChangeRecordServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 021d8f8..b768edd 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
@@ -83,7 +83,7 @@
int toIndex = (int) Math.min(fromIndex + size, walletStatisticsDetailList.size());
if (fromIndex >= walletStatisticsDetailList.size()) {
- throw new ServiceException("页面参数无效");
+ return new WalletStatistics();
}
@@ -106,7 +106,8 @@
WalletStatistics walletStatistics = new WalletStatistics();
Page<WalletStatisticsDetail> walletStatisticsDetailPage = new Page<>();
walletStatisticsDetailPage.setCurrent(current);
- walletStatisticsDetailPage.setSize(walletStatisticsDetailList.size());
+ walletStatisticsDetailPage.setSize(size);
+ walletStatisticsDetailPage.setTotal(walletStatisticsDetailList.size());
walletStatisticsDetailPage.setRecords(walletStatisticsDetailList2);
walletStatistics.setPage(walletStatisticsDetailPage);
walletStatistics.setTotalRecharge(totalRecharge);
--
Gitblit v1.7.1