Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -407,7 +407,7 @@ public class RetailAppServiceImp implements RetailAppService {
         params.put("client_id", client_id);
 
         PageList<JSONObject> orders = orderMapper.listTransactionsForApp(params,
-                new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
+                new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc")));
         TimeZoneUtils.switchTimeZone(orders, query.getTimezone(), "create_time", "transaction_time", "confirm_time");
         ArrayList<String> date_contains = new ArrayList<>();
         for (JSONObject order : orders) {
@@ -445,7 +445,7 @@ public class RetailAppServiceImp implements RetailAppService {
                 }
                 JSONObject date_params = date_query.toParams(query.getTimezone());
                 date_params.put("client_id", device.getIntValue("client_id"));
-                JSONObject analysis = orderMapper.analysisOrders(date_params);
+                JSONObject analysis = transactionAnalysisMapper.getClientTransaction(date_params);
                 order.put("date_total", analysis);
                 date_contains.add(trade_date);
             }

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml

@@ -455,6 +455,8 @@
             o.notify_url,
             t.transaction_time,
             t.system_transaction_id,
+            t.total_surcharge,
+            t.tax_amount,
             o.status,
             o.order_description,
             o.order_detail,
@@ -667,9 +669,9 @@
             <if test="client_ids==null and client_id !=null">
                 and o.client_id=#{client_id}
             </if>
-            <if test="from!=null">and o.create_time &gt;= #{from}</if>
+            <if test="from!=null">and t.transaciton_time &gt;= #{from}</if>
-            <if test="to!=null">and o.create_time &lt; #{to}</if>
+            <if test="to!=null">and t.transaction_time &lt; #{to}</if>
-            <if test="date!=null">and date(o.create_time)=date(#{date})
+            <if test="date!=null">and date(t.transaction_time)=date(#{date})
             </if>
             <if test="trade_type!=null">and o.gateway in
                 <foreach collection="trade_type" item="gateway" open="(" close=")" separator=",">#{gateway}</foreach>