From 7f3644467e982aa66cab930660b061623a75bb55 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Mon, 11 Oct 2021 15:19:52 +0800 Subject: [PATCH] =?UTF-8?q?partner=5Fdashboard=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B8=85=E7=AE=97=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mappers/payment/TransactionMapper.java | 2 + .../core/impls/TradeLogServiceImpl.java | 2 +- .../mappers/payment/TransactionMapper.xml | 44 +++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java index 828a5ca80..4278ea9bc 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java @@ -60,6 +60,8 @@ public interface TransactionMapper { PageList listSettlementLog(JSONObject params, PageBounds pagination); + PageList listSettlementLogForDashbord(JSONObject params, PageBounds pagination); + @CountRef(".countSettlementLogInClients") PageList listSettlementLogInClients(JSONObject params, PageBounds pagination); diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index 0ec3dff0f..46ffd3ea3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -1423,7 +1423,7 @@ public class TradeLogServiceImpl implements TradeLogService { params.remove("client_ids"); params.put("merge_settle", true); } - PageList logs = transactionMapper.listSettlementLog(params, + PageList logs = transactionMapper.listSettlementLogForDashbord(params, new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc"))); logs.forEach(log -> log.put("padding", log.getBooleanValue("editable"))); result.putAll(PageListUtils.buildPageListResult(logs)); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 4865a7dfa..5d679c115 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -600,6 +600,50 @@ order by t.clearing_time desc + +