From f72ab6e8d5941be0aa9d3cff79e635e48164d444 Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Tue, 19 Nov 2019 14:54:05 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E4=BA=A4=E6=98=93=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8Btimezone=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 .../royalpay/payment/manage/tradelog/beans/TradeLogQuery.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5d74188c9..01de04bf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.2.87</version>
+    <version>1.2.88</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java
index e07ae95c4..ca724c916 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java
@@ -57,7 +57,7 @@ public class TradeLogQuery {
             params.put("from", fromDate.toDate());
         }
         if (dateto != null) {
-            DateTime toDate = DateTime.parse(dateto, DateTimeFormat.forPattern("yyyyMMdd")).withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(timezone))).plusDays(1).withZone(DateTimeZone.getDefault());
+            DateTime toDate = DateTime.parse(dateto, DateTimeFormat.forPattern("yyyyMMdd")).withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(StringUtils.isNotBlank(timezone) ? timezone : "Australia/Melbourne"))).plusDays(1).withZone(DateTimeZone.getDefault());
             params.put("to", toDate.toDate());
         }