From 546df5fef06d71e63bf2d2733849f7b6861bf47e Mon Sep 17 00:00:00 2001 From: luoyang Date: Fri, 12 Oct 2018 18:23:13 +0800 Subject: [PATCH] fix rpay+ modifySurchargeConfig on --- .../manage/dev/core/impl/ManualServiceimpl.java | 6 +++--- .../manage/merchants/core/impls/ClientManagerImpl.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) 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 f40ad5a7e..c5f08f985 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 120dc8340..5e86590dc 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 @@ -1600,7 +1600,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate"); configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate"); //todo 暂不更新Rpay+ 费率信息 -// rpayApi.modifySurchargeConfig(client); + rpayApi.modifySurchargeConfig(client); } @@ -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"); @@ -4018,7 +4018,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid record.put("remark", "费率到期系统自动延期1年"); clientRateMapper.saveRate(record); if ("Rpay".equals(o.getString("rate_name"))) { - //rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id)); + rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id)); } } clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client.getString("client_moniker"), "tax_in_surcharge", false));