|
|
@ -44,14 +44,14 @@ public class TradeLogQuery {
|
|
|
|
JSONObject params = new JSONObject();
|
|
|
|
JSONObject params = new JSONObject();
|
|
|
|
if (datefrom != null) {
|
|
|
|
if (datefrom != null) {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
params.put("from", TimeZoneUtils.formatTime(format.parse(datefrom),"yyyy-MM-dd HH:mm:ss",timezone!=null?timezone:""));
|
|
|
|
params.put("from", TimeZoneUtils.formatTime(format.parse(datefrom),"yyyy-MM-dd HH:mm:ss",timezone!=null?timezone:"Australia/Melbourne"));
|
|
|
|
} catch (ParseException e) {
|
|
|
|
} catch (ParseException e) {
|
|
|
|
throw new ParamInvalidException("datefrom", "error.payment.valid.invalid_date_format");
|
|
|
|
throw new ParamInvalidException("datefrom", "error.payment.valid.invalid_date_format");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (dateto != null) {
|
|
|
|
if (dateto != null) {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
params.put("to", TimeZoneUtils.formatTime(DateUtils.addDays(format.parse(dateto), 1),"yyyy-MM-dd HH:mm:ss",timezone!=null?timezone:""));
|
|
|
|
params.put("to", TimeZoneUtils.formatTime(DateUtils.addDays(format.parse(dateto), 1),"yyyy-MM-dd HH:mm:ss",timezone!=null?timezone:"Australia/Melbourne"));
|
|
|
|
} catch (ParseException e) {
|
|
|
|
} catch (ParseException e) {
|
|
|
|
throw new ParamInvalidException("dateto", "error.payment.valid.invalid_date_format");
|
|
|
|
throw new ParamInvalidException("dateto", "error.payment.valid.invalid_date_format");
|
|
|
|
}
|
|
|
|
}
|
|
|
|