From caa9ae63bee9190b34dd3c509314c3cef453036f Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Mon, 1 Oct 2018 22:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E=E8=B4=B9?=
 =?UTF-8?q?=E7=8E=87=E5=BC=82=E5=B8=B8+=20=E6=9A=82=E4=B8=8D=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8rpay+=E8=B4=B9=E7=8E=87=E4=BF=AE=E6=94=B9api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/merchants/core/impls/ClientManagerImpl.java      | 4 ++--
 .../payment/partner/templates/partner_bankaccounts.html     | 6 +++---
 .../static/payment/partner/templates/partner_new_rate.html  | 2 +-
 .../payment/partner/templates/rate_config_dialog.html       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
index 15d9d6f59..1cf696a6c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
@@ -1599,8 +1599,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         configNewClientRate(config, clientId, "jd", "jd_rate_value", org, "min_jd_rate");
         configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate");
         configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
-
-        rpayApi.modifySurchargeConfig(client);
+        //todo 暂不更新Rpay+ 费率信息
+//        rpayApi.modifySurchargeConfig(client);
 
     }
 
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 b67d76a26..b5ffe8070 100644
--- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
+++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html
@@ -179,7 +179,7 @@
                 <tr>
                     <th>Rate Name</th>
                     <th>Rate Value</th>
-                    <th>Transaction Fee</th>
+                    <th>Transaction Fee(cent)</th>
                     <th>Active Time</th>
                     <th>Expire Time</th>
                     <th ng-if="bankCtrl.rate_name=='Wechat'">Clean Days</th>
@@ -193,8 +193,8 @@
                 <tr ng-repeat="rate in rates|filter:{rate_name:bankCtrl.rate_name}:true"
                     ng-class="{'text-bold':rate.current,'success':rate.active}">
                     <td ng-bind="rate.rate_name"></td>
-                    <td ng-bind="rate.rate_value"></td>
-                    <td ng-bind="rate.transaction_fee"></td>
+                    <td ng-bind="rate.rate_value + ' %'"></td>
+                    <td ng-bind="rate.transaction_fee + ' c'"></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>
diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
index cf41ab976..9b3d9937c 100644
--- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html
+++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
@@ -168,7 +168,7 @@
                         <div class="input-group">
                             <input type="number" name="Transaction_fee_value" stringToNumber2 class="form-control" ng-model="rate.transaction_fee"
                                    min="0" step="0.1" id="transaction_fee_input" required>
-
+                            <div class="input-group-addon">c</div>
                         </div>
                         <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
                             <div class="small text-danger" ng-message="min">
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 d92b9ecf6..738663dec 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
@@ -43,7 +43,7 @@
                         <div class="input-group">
                             <input type="number" name="transaction_fee" class="form-control" ng-model="rate.transaction_fee"
                                    min="0" step="0.1" id="transaction_fee_input" required>
-
+                            <div class="input-group-addon">c</div>
                         </div>
                         <div ng-messages="rate_form.transaction_fee.$error" ng-if="rate_form.transaction_fee.$dirty">
                             <!--<div class="small text-danger" ng-message="max">-->