From a8a5fd2a1db754d6f2e3beb552e5ed891bcaf058 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Tue, 7 Apr 2020 15:16:54 +0800
Subject: [PATCH] fix incremental surcharge rate

---
 .../payment/tradelog/templates/partner_settlement_dialog.html | 4 +++-
 .../templates/partner_settlement_merge_settle_dialog.html     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index af3dcc95c..4751c0ca1 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -186,7 +186,9 @@
                     <td ng-bind="tr.transaction_amount"></td>
                     <!--<td ng-bind="tr.surcharge_rate?(tr.surcharge_rate|percentage:1):report.channels[tr.channel].rate+'%'"></td>-->
                     <td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></td>
-                    <td>{{(tr.surcharge_rate * 100 - tr.rate_value)| number : 2}}<span ng-if="tr.surcharge_rate">%</span></td>
+                    <td>{{(((tr.surcharge_rate * 100) < tr.rate_value)?(tr.surcharge_rate * 100-tr.rate_value):0.00)| number : 2}}
+                        <span ng-if="tr.surcharge_rate">%</span>
+                    </td>
                     <td>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}}</td>
                     <td><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
                     <td>{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html
index d3bb5a488..a6c5ef153 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_merge_settle_dialog.html
@@ -190,7 +190,7 @@
                     <td ng-bind="tr.transaction_amount"></td>
                     <!--<td ng-bind="tr.surcharge_rate?(tr.surcharge_rate|percentage:1):report.channels[tr.channel].rate+'%'"></td>-->
                     <td ng-bind="tr.total_surcharge?tr.total_surcharge:0"></td>
-                    <td>{{(tr.surcharge_rate * 100 - tr.rate_value)| number : 2}}<span ng-if="tr.surcharge_rate">%</span></td>
+                    <td>{{(((tr.surcharge_rate * 100) < tr.rate_value)?(tr.surcharge_rate * 100-tr.rate_value):0.00)| number : 2}}<span ng-if="tr.surcharge_rate">%</span></td>
                     <td>{{(tr.total_surcharge-tr.incremental_surcharge) | number : 2 | currency:tr.currency}}</td>
                     <td><span ng-if="tr.rate_value">{{tr.source}}:{{(tr.rate_value) | number : 2}}%</span></td>
                     <td>{{tr.source}}:<span ng-if="tr.incremental_surcharge">{{tr.incremental_surcharge | currency:tr.currency}}</span><span ng-if="!tr.incremental_surcharge">{{0.00 | currency:tr.currency}}</span></td>