From 63f12caff673f2946f3f379c9dd9181e27d9bf74 Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Mon, 18 Nov 2019 20:21:50 +0800
Subject: [PATCH] =?UTF-8?q?Upd:=E5=95=86=E6=88=B7=E7=AB=AFWEB=EF=BC=8CAPP?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?=
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, 3 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index d19b81d7a..5d74188c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.2.86</version>
+    <version>1.2.87</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/appclient/beans/AppQueryBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java
index 8eb8c862e..874757cdc 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
@@ -48,13 +48,9 @@ public class AppQueryBean {
             params.put("from", fromDate.toDate());
         }
         if (end != null) {
-/*            DateTime toDate = DateTime.parse(end, DateTimeFormat.forPattern("yyyyMMdd")).withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(timezone))).plusDays(1).withZone(DateTimeZone.getDefault());
+            DateTime toDate = DateTime.parse(end, DateTimeFormat.forPattern("yyyyMMdd")).withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(timezone))).plusDays(1).withZone(DateTimeZone.getDefault());
             params.put("end", toDate.toDate());
-            params.put("to", toDate.toDate());*/
-            DateTime toDate = DateTime.parse(end, DateTimeFormat.forPattern("yyyyMMdd"))
-                    .withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(StringUtils.isNotBlank(timezone)?timezone:"Australia/Melbourne"))).withZone(DateTimeZone.getDefault());
-            params.put("end", DateUtils.addDays(toDate.toDate(), 1));
-            params.put("to", DateUtils.addDays(toDate.toDate(), 1));
+            params.put("to", toDate.toDate());
 
         }
         if (gateway != null && gateway.length > 0) {