diff --git a/pom.xml b/pom.xml index 20bfe4fb2..81065759e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 manage - 1.2.12 + 1.2.13 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 8e2c8382a..e59b57858 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 @@ -77,6 +77,7 @@ import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; +import org.joda.time.DateTime; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.slf4j.LoggerFactory; @@ -855,7 +856,15 @@ 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); + } 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"); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index 79ede0a7b..87b4b3557 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -728,8 +728,8 @@ and o.client_id=#{client_id} - and t.transaction_time >= #{from} - and t.transaction_time < #{to} + and o.create_time >= #{from} + and o.create_time < #{to} and date(t.transaction_time)=date(#{date}) and o.gateway in