diff --git a/pom.xml b/pom.xml index d99921081..38a6673d2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.2.85 + 1.2.86 UTF-8 1.6.1 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 c6ca197eb..560b13ea4 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 @@ -42,16 +42,20 @@ public class AppQueryBean { public JSONObject toParams() { JSONObject params = new JSONObject(); if (begin != null) { - DateTime fromDate = DateTime.parse(begin, DateTimeFormat.forPattern("yyyyMMdd")) - .withZoneRetainFields(DateTimeZone.forTimeZone(TimeZone.getTimeZone(StringUtils.isNotBlank(timezone)?timezone:"Australia/Melbourne"))).withZone(DateTimeZone.getDefault()); - params.put("begin", fromDate.toDate()); - params.put("from", fromDate.toDate()); + try { + params.put("begin", format.parse(begin)); + params.put("from", format.parse(begin)); + } catch (ParseException e) { + throw new ParamInvalidException("begin", "error.payment.valid.invalid_date_format"); + } } if (end != null) { - 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)); + try { + params.put("end", DateUtils.addDays(format.parse(end), 1)); + params.put("to", DateUtils.addDays(format.parse(end), 1)); + } catch (ParseException e) { + throw new ParamInvalidException("end", "error.payment.valid.invalid_date_format"); + } } if (gateway != null && gateway.length > 0) { List tradeTypes = new ArrayList<>();