From 4fefff17528a878d345ff3311c297a66a671b8d6 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 03 Apr 2026 15:41:28 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java
index 97ccf34..51c0e6b 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yami.trading.bean.item.domain.Item;
+import com.yami.trading.bean.item.dto.Symbol2DTO;
import com.yami.trading.bean.model.MoneyLog;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
@@ -43,13 +44,19 @@
public Result list(HttpServletRequest request) throws IOException {
String partyId = SecurityUtils.getUser().getUserId();
String page_no = request.getParameter("page_no");
+ String page_size = request.getParameter("page_size");
String symbolType = request.getParameter("symbolType");
if (StringUtils.isNullOrEmpty(page_no)
|| !StringUtils.isInteger(page_no) || Integer.valueOf(page_no) <= 0) {
page_no = "1";
}
+ if (StringUtils.isNullOrEmpty(page_size)
+ || !StringUtils.isInteger(page_size) || Integer.valueOf(page_size) <= 0) {
+ page_size = "20";
+ }
double amount = 0;
int pageNo = Integer.valueOf(page_no);
+ int pageSize = Integer.valueOf(page_size);
String category = request.getParameter("category");
String contentType = request.getParameter("contentType");
if (symbolType==null){
@@ -57,7 +64,7 @@
}
List<String> symbols = itemService.findByType(symbolType).stream().map(Item::getSymbol).collect(Collectors.toList());
symbols.add("-1");
- Page<MoneyLog> page = new Page<>(pageNo, 20);
+ Page<MoneyLog> page = new Page<>(pageNo, pageSize);
LambdaQueryWrapper<MoneyLog> lambdaQueryWrapper = Wrappers.<MoneyLog>query().lambda().eq(MoneyLog::getUserId, partyId);
// 不显示不可见的
lambdaQueryWrapper.ne(MoneyLog::getShow, "0");
@@ -127,8 +134,9 @@
log.setCreateTimeStr(DateUtils.format(showCreateTime, DateUtils.DF_yyyyMMddHHmmss));
}
}
-
- return Result.succeed(page.getRecords());
+ Result ok = Result.succeed(page.getRecords());
+ ok.setTotal(page.getTotal());
+ return ok;
}
}
--
Gitblit v1.9.3