msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
master
taylor.dang 6 years ago
parent a6042c523e 546df5fef0
commit 52612cad65
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java
Unescape View File

@ -103,9 +103,9 @@ public class ManualServiceimpl implements ManualService {
record.put("manager_name", "System"); record.put("manager_name", "System");
record.put("remark", "费率到期系统自动延期1年"); record.put("remark", "费率到期系统自动延期1年");
clientRateMapper.saveRate(record); clientRateMapper.saveRate(record);
// if ("Rpay".equals(o.getString("rate_name"))) { 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_moniker, "tax_in_surcharge", false)); clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client_moniker, "tax_in_surcharge", false));

10
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -1600,7 +1600,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate"); configNewClientRate(config, clientId, "hf", "hf_rate_value", org, "min_hf_rate");
configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate"); configNewClientRate(config, clientId, "Rpay", "Rpay_rate_value", org, "min_Rpay_rate");
//todo 暂不更新Rpay+ 费率信息 //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("manager_name", manager.getString("username"));
configJson.put("update_time", new Date()); configJson.put("update_time", new Date());
clientRateMapper.updateConfig(configJson); clientRateMapper.updateConfig(configJson);
// if ("Rpay".equals(configJson.getString("rate_name"))) { if ("Rpay".equals(configJson.getString("rate_name"))) {
// rpayApi.modifySurchargeConfig(client); rpayApi.modifySurchargeConfig(client);
// } }
int clientId = client.getIntValue("client_id"); int clientId = client.getIntValue("client_id");
JSONObject changeRate = merchantInfoProvider.clientCurrentRate(clientId, new Date(), "Wechat"); JSONObject changeRate = merchantInfoProvider.clientCurrentRate(clientId, new Date(), "Wechat");
int cleanDays = changeRate.getIntValue("clean_days"); int cleanDays = changeRate.getIntValue("clean_days");
@ -4018,7 +4018,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
record.put("remark", "费率到期系统自动延期1年"); record.put("remark", "费率到期系统自动延期1年");
clientRateMapper.saveRate(record); clientRateMapper.saveRate(record);
if ("Rpay".equals(o.getString("rate_name"))) { 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)); clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client.getString("client_moniker"), "tax_in_surcharge", false));

Write Preview
Loading…
Cancel
Save