From 7f3644467e982aa66cab930660b061623a75bb55 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Mon, 11 Oct 2021 15:19:52 +0800
Subject: [PATCH] =?UTF-8?q?partner=5Fdashboard=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B8=85=E7=AE=97=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/payment/TransactionMapper.java    |  2 +
 .../core/impls/TradeLogServiceImpl.java       |  2 +-
 .../mappers/payment/TransactionMapper.xml     | 44 +++++++++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

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 828a5ca80..4278ea9bc 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> listSettlementLogForDashbord(JSONObject params, PageBounds pagination);
+
     @CountRef(".countSettlementLogInClients")
     PageList<JSONObject> listSettlementLogInClients(JSONObject params, PageBounds pagination);
 
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index 0ec3dff0f..46ffd3ea3 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -1423,7 +1423,7 @@ public class TradeLogServiceImpl implements TradeLogService {
             params.remove("client_ids");
             params.put("merge_settle", true);
         }
-        PageList<JSONObject> logs = transactionMapper.listSettlementLog(params,
+        PageList<JSONObject> logs = transactionMapper.listSettlementLogForDashbord(params,
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
         logs.forEach(log -> log.put("padding", log.getBooleanValue("editable")));
         result.putAll(PageListUtils.buildPageListResult(logs));
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 4865a7dfa..5d679c115 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
@@ -600,6 +600,50 @@
         order by t.clearing_time desc
     </select>
 
+    <select id="listSettlementLogForDashbord" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT cd.client_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,
+            SUM(cd.gross_amount) total,
+            SUM(cd.clearing_amount) income,
+            SUM(cd.gross_amount-cd.clearing_amount) fee,
+        </if>
+        <if test="merge_settle==null">
+            cd.tax_amount,
+            cd.total_charge,
+            cd.gross_amount total,
+            cd.clearing_amount income,
+            cd.gross_amount-cd.clearing_amount fee,
+        </if>
+
+        (SELECT min(r.rate_value) FROM  sys_client_rates r WHERE r.client_id = cd.client_id
+        AND date(r.expiry_time) >= DATE(cd.report_date)
+        AND date(r.active_time) &lt;= DATE(cd.report_date)) rate,
+        cd.clear_detail_id,
+        lc.balance_group, lc.editable
+        FROM log_clearing_detail cd
+        left join log_clearing lc on cd.clearing_id = lc.clearing_id
+        left join sys_clients sc on cd.client_id = sc.client_id
+        WHERE
+
+        <if test="client_ids!=null">
+            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">
+             (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>
+        order by cd.report_date desc
+    </select>
+
     <select id="listSettlementLogTotal" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT DATE(t.transaction_time) clearing_time,date_format(t.transaction_time, '%Y-%m-%d') clear_time,SUM(t.clearing_amount) total,