From 89091ae46179ca1c664554bf2df8c3b850c4acd6 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 30 Oct 2019 10:32:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=20app=E6=97=B6=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 2 +-
 .../payment/manage/appclient/beans/AppQueryBean.java      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index e5b72d32e..7f4b2c6d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.45</version>
+    <version>1.2.46</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java
index 9cf7ebfe9..8a65dc901 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java
@@ -43,16 +43,16 @@ public class AppQueryBean {
         }
         if (begin != null) {
             try {
-                params.put("begin", TimeZoneUtils.formatTime(format.parse(begin),"yyyy-MM-dd HH:mm:ss","Australia/Melbourne"));
-                params.put("from", TimeZoneUtils.formatTime(format.parse(begin),"yyyy-MM-dd HH:mm:ss","Australia/Melbourne"));
+                params.put("begin", TimeZoneUtils.formatTime(format.parse(begin),"yyyy-MM-dd HH:mm:ss",StringUtils.isNotBlank(timezone)?timezone:"Australia/Melbourne"));
+                params.put("from", TimeZoneUtils.formatTime(format.parse(begin),"yyyy-MM-dd HH:mm:ss",StringUtils.isNotBlank(timezone)?timezone:"Australia/Melbourne"));
             } catch (ParseException e) {
                 throw new ParamInvalidException("begin", "error.payment.valid.invalid_date_format");
             }
         }
         if (end != null) {
             try {
-                params.put("end", TimeZoneUtils.formatTime(DateUtils.addDays(format.parse(end), 1),"yyyy-MM-dd HH:mm:ss","Australia/Melbourne"));
-                params.put("to", TimeZoneUtils.formatTime(DateUtils.addDays(format.parse(end), 1),"yyyy-MM-dd HH:mm:ss","Australia/Melbourne"));
+                params.put("end", TimeZoneUtils.formatTime(DateUtils.addDays(format.parse(end), 1),"yyyy-MM-dd HH:mm:ss",StringUtils.isNotBlank(timezone)?timezone:"Australia/Melbourne"));
+                params.put("to", TimeZoneUtils.formatTime(DateUtils.addDays(format.parse(end), 1),"yyyy-MM-dd HH:mm:ss",StringUtils.isNotBlank(timezone)?timezone:"Australia/Melbourne"));
             } catch (ParseException e) {
                 throw new ParamInvalidException("end", "error.payment.valid.invalid_date_format");
             }