From c981e127d203a1677834ea55c051410635a0b1e1 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 20 Mar 2020 11:21:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E7=AB=AFtransaction?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      | 2 +-
 .../manage/tradelog/core/impls/TradeLogServiceImpl.java      | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0bb623d5b..5a6e980f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.3</version>
+    <version>1.4.5</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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 f9f65ff54..4554f83b0 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
@@ -536,8 +536,9 @@ public class TradeLogServiceImpl implements TradeLogService {
         JSONObject mchConfig = merchantInfoProvider.getMchExtParams(partner.getIntValue("client_id"));
         params.put("hide_sub_mch", mchConfig.getBooleanValue("hide_sub_mch"));
 
-        List<JSONObject> logs = transactionMapper.listTransFlowPage(params,
-                new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc")));
+//        PageList<JSONObject> logs = transactionMapper.listTransFlowPage(params,
+//                new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc")));
+        List<JSONObject> logs = transactionMapper.listTransFlow(params);
         TimeZoneUtils.switchTimeZone(logs, timezone, "create_time", "confirm_time", "transaction_time");
         Paginator paginator = new Paginator(query.getPage(), query.getLimit(), logs.size());
         List<JSONObject> pagedLogsList = logs.stream()