From 81f7c0d10c9f63af1598f9f7b8f5b16494e6ac8d Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 21 Nov 2019 14:22:28 +0800
Subject: [PATCH] fix incremental rate

---
 .../manage/tradelog/core/impls/TradeLogServiceImpl.java        | 3 ---
 .../royalpay/payment/manage/mappers/payment/OrderMapper.xml    | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

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 d1450e17e..eb859afe0 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
@@ -202,9 +202,6 @@ public class TradeLogServiceImpl implements TradeLogService {
                 }
             }
         }
-        for (JSONObject log : logs) {
-            log.put("rate_value",sysClientIncrementalMapper.findByChannelAndClientId(log.getString("client_id"),log.getString("source")));
-        }
         JSONObject result = PageListUtils.buildPageListResult(logs);
         JSONObject analysis = orderMapper.analysisOrders(params);
         result.put("analysis", analysis);
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 bfa9fb6ea..200d5999a 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
@@ -539,6 +539,7 @@
 
     <select id="listIncrementalOrdersByClients" resultType="com.alibaba.fastjson.JSONObject">
         <include refid="tradelog_list_keys"/>
+        ,i.incremental_rate as rate_value
         FROM pmt_orders o
         INNER JOIN sys_clients p ON p.client_id=o.client_id and p.is_valid=1
         <if test="client_ids!=null">
@@ -551,6 +552,7 @@
             and p.client_id=#{client_id}
         </if>
         LEFT JOIN pmt_transactions t on t.order_id=o.order_id and t.refund_id is null and t.transaction_type='Credit'
+        LEFT JOIN pmt_incremental_detail i on i.transaction_id = t.transaction_id
         <where>
             <if test="from!=null">and o.create_time &gt;= #{from}</if>
             <if test="to!=null">and o.create_time &lt; #{to}</if>