diff --git a/pom.xml b/pom.xml index d19b81d7a..5d74188c9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.86 + 1.2.87 UTF-8 1.4.0 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) {