From 936fddc8cf47fe7a1dd85e6e4ef777cd024062a4 Mon Sep 17 00:00:00 2001
From: Todking <tod.wu@geekforbest.com>
Date: Thu, 30 Dec 2021 15:40:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E8=B4=B9=E7=8E=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=E6=B8=85?=
 =?UTF-8?q?=E7=AE=97=E5=91=A8=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partner/templates/partner_bankaccounts.html        | 10 ++--------
 .../payment/partner/templates/rate_config_dialog.html  |  4 +---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
index ffbfae97a..de1d6507a 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -281,10 +281,7 @@
                             <th>Transaction Fee</th>
                             <th>Active Time</th>
                             <th>Expire Time</th>
-                            <th
-                                    ng-if="bankCtrl.rate_name=='Wechat'">
-                                Clean Days
-                            </th>
+                            <th>Clean Days</th>
                             <th>Update Time</th>
                             <th>Operator</th>
                             <th>Remark</th>
@@ -299,10 +296,7 @@
                             <td ng-bind="'$ '+rate.transaction_fee"></td>
                             <td ng-bind="rate.active_time|date:'yyyy-MM-dd'"></td>
                             <td ng-bind="rate.expiry_time|date:'yyyy-MM-dd'"></td>
-                            <td
-                                    ng-if="rate.rate_name=='Wechat'">
-                                T+{{rate.clean_days}}
-                            </td>
+                            <td>T+{{rate.clean_days}}</td>
                             <td ng-bind="rate.update_time|date:'yyyy-MM-dd'"></td>
                             <td ng-bind="rate.operator_name||'系统生成'"></td>
                             <td ng-bind="rate.remark|limitTo:20" title="{{rate.remark}}"></td>
diff --git a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
index 586607cba..64402eecd 100644
--- a/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
+++ b/src/main/ui/static/payment/partner/templates/rate_config_dialog.html
@@ -104,9 +104,7 @@
                                datepicker-options="{minDate:rate.active_time}">
                     </div>
                 </div>
-                <div class="form-group" ng-if="rate.rate_name=='Wechat'
-                || rate.rate_name=='rpaypmt_card'
-                || rate.rate_name=='rpaypmt_dd'">
+                <div class="form-group">
                     <label class="control-label col-sm-4" for="clean_days_input">Clean Days</label>
                     <div class="col-sm-6">
                         <div class="input-group">

From ba0f8333effdcdf37d6638fc7835557a1557d90c Mon Sep 17 00:00:00 2001
From: Yixian <davepotter@163.com>
Date: Thu, 30 Dec 2021 16:05:42 +0800
Subject: [PATCH 2/2] fix: settlement detailed transactions

---
 .../payment/manage/mappers/payment/TransactionMapper.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 478df93b9..69d08bdf0 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
@@ -1252,7 +1252,7 @@
         FROM pmt_transactions t
                  LEFT JOIN pmt_orders o ON o.order_id = t.order_id
                  LEFT JOIN pmt_refunds r ON r.refund_id = t.refund_id
-                 LEFT JOIN sys_client_incremental sci on sci.client_id = t.client_id
+                 LEFT JOIN sys_client_incremental sci on sci.client_id = t.client_id and sci.channel=o.source and sci.is_valid=1
                  INNER JOIN log_clearing_detail lcd ON t.clearing_order = lcd.clear_detail_id
         WHERE t.channel != 'Settlement'
           AND t.clearing_order = #{clearing_order}