diff --git a/pom.xml b/pom.xml index 777ea0a37..49d17121f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.24 + 1.2.25 UTF-8 diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java index c0db20b89..26c8dc166 100644 --- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java @@ -929,15 +929,16 @@ public class RetailAppServiceImp implements RetailAppService { params.put("dev_id", device.getString("dev_id")); } params.put("client_id", client_id); - if (StringUtils.isBlank(params.getString("begin"))) { - Date now = new Date(); - Date lastWeekDay = DateUtils.addDays(now, -7); - lastWeekDay = new DateTime(lastWeekDay.getTime()).withTimeAtStartOfDay().toDate(); - params.put("from", lastWeekDay); - params.put("begin", lastWeekDay); - params.put("end", now); - params.put("to", now); - } + //去掉默认7天查询时间 +// if (StringUtils.isBlank(params.getString("from"))) { +// Date now = new Date(); +// Date lastWeekDay = DateUtils.addDays(now, -7); +// lastWeekDay = new DateTime(lastWeekDay.getTime()).withTimeAtStartOfDay().toDate(); +// params.put("from", lastWeekDay); +// params.put("begin", lastWeekDay); +// params.put("end", now); +// params.put("to", now); +// } PageList orders = orderMapper.listTransactionsForApp(params, new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc"))); TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");