From 6523740dcda6632acaff158aa6477992e3813f2e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 17 Sep 2019 18:17:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20app=E8=AE=A2=E5=8D=95=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=85=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               |  2 +-
 .../appclient/core/impls/RetailAppServiceImp.java     | 11 ++++++++++-
 .../payment/manage/mappers/payment/OrderMapper.xml    |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 20bfe4fb2..81065759e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.12</version>
+    <version>1.2.13</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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<JSONObject> 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 @@
             <if test="client_ids==null and client_id !=null">
                 and o.client_id=#{client_id}
             </if>
-            <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
-            <if test="to!=null">and t.transaction_time &lt; #{to}</if>
+            <if test="from!=null">and o.create_time &gt;= #{from}</if>
+            <if test="to!=null">and o.create_time &lt; #{to}</if>
             <if test="date!=null">and date(t.transaction_time)=date(#{date})
             </if>
             <if test="trade_type!=null">and o.gateway in