From fef5801a2cd8267cf79ae1b7b0d9f5d853ac99a0 Mon Sep 17 00:00:00 2001
From: Yixian <davepotter@163.com>
Date: Wed, 17 Nov 2021 12:11:53 +0800
Subject: [PATCH] list settlement log only query log_clear_detail

---
 .../mappers/payment/TransactionMapper.java    |  2 ++
 .../mappers/payment/TransactionMapper.xml     | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
index 4278ea9bc..711f7fc44 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
@@ -60,6 +60,8 @@ public interface TransactionMapper {
 
     PageList<JSONObject> listSettlementLog(JSONObject params, PageBounds pagination);
 
+    PageList<JSONObject> listSettlementLogOrigin(JSONObject params, PageBounds pagination);
+
     PageList<JSONObject> listSettlementLogForDashbord(JSONObject params, PageBounds pagination);
 
     @CountRef(".countSettlementLogInClients")
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index a3ad97ee1..946df2cc5 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -559,6 +559,41 @@
     </select>
 
     <select id="listSettlementLog" resultType="com.alibaba.fastjson.JSONObject">
+        select cd.cling_id, cd.report_date clearing_time, cd.report_date,
+        <if test="merge_settle!=null">
+            SUM(cd.tax_amount)  as tax_amount,
+            SUM(cd.total_charge) as total_charge,
+            1 as merge_settle,
+        </if>
+        <if test="merge_settle==null">
+            cd.tax_amount,
+            cd.total_charge,
+        </if>
+               sum(cd.gross_amount) total,
+               sum(cd.clearing_amount) income,
+               sum(cd.total_charge+cd.tax_amount) fee,
+        (SELECT min(r.rate_value) FROM  sys_client_rates r WHERE r.client_id = t.client_id
+        AND r.expiry_time > cd.report_date
+        AND r.active_time &lt;= cd.report_date) rate
+        from log_clearing_detail cd
+        inner join sys_clients sc on sc.client_id=cd.client_id
+        <if test="client_ids!=null">
+            AND cd.client_id IN
+            <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
+                #{client_id}
+            </foreach>
+        </if>
+        <if test="client_ids==null and client_id !=null">
+            and (sc.client_id=#{client_id} or sc.parent_client_id =#{client_id})
+        </if>
+        <if test="from!=null">and cd.report_date &gt;= #{from}</if>
+        <if test="to!=null">and cd.report_date &lt; #{to}</if>
+        <if test="merge_settle!=null">GROUP BY report_date</if>
+        <if test="merge_settle==null">GROUP BY clear_detail_id</if>
+        order by clearing_id desc
+    </select>
+
+    <select id="listSettlementLogOrigin" resultType="com.alibaba.fastjson.JSONObject">
         SELECT t.client_id,DATE(t.transaction_time) clearing_time,
         ifnull(cd.report_date,date(t.transaction_time)) report_date,
         <if test="merge_settle!=null">