From 5e495fb7659e3fe73e47c56ad5972617bd3d2902 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Mon, 1 Oct 2018 23:07:02 +0800
Subject: [PATCH] fix

---
 .../royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java | 2 +-
 .../payment/manage/dev/core/impl/ManualServiceimpl.java     | 6 +++---
 .../manage/merchants/core/impls/ClientManagerImpl.java      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java
index e9fa6ccc4..89f113f31 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/HfUpdateImpl.java
@@ -55,7 +55,7 @@ public class HfUpdateImpl implements HfUpdateService {
         StringBuffer sb = new StringBuffer();
         clientIds.forEach(dbResult -> {
             try {
-                rpayApi.modifySurchargeConfig(dbResult);
+//                rpayApi.modifySurchargeConfig(dbResult);
             } catch (Exception e) {
                 sb.append("【" + dbResult.getString("client_moniker") + "】、");
             }
diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
index c5f08f985..f40ad5a7e 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
@@ -103,9 +103,9 @@ public class ManualServiceimpl implements ManualService {
             record.put("manager_name", "System");
             record.put("remark", "费率到期系统自动延期1年");
             clientRateMapper.saveRate(record);
-            if ("Rpay".equals(o.getString("rate_name"))) {
-                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
-            }
+//            if ("Rpay".equals(o.getString("rate_name"))) {
+//                rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
+//            }
 
         });
         clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client_moniker, "tax_in_surcharge", false));
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 1cf696a6c..120dc8340 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
@@ -1644,9 +1644,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         configJson.put("manager_name", manager.getString("username"));
         configJson.put("update_time", new Date());
         clientRateMapper.updateConfig(configJson);
-        if ("Rpay".equals(configJson.getString("rate_name"))) {
-            rpayApi.modifySurchargeConfig(client);
-        }
+//        if ("Rpay".equals(configJson.getString("rate_name"))) {
+//            rpayApi.modifySurchargeConfig(client);
+//        }
         int clientId = client.getIntValue("client_id");
         JSONObject changeRate = merchantInfoProvider.clientCurrentRate(clientId, new Date(), "Wechat");
         int cleanDays = changeRate.getIntValue("clean_days");