Merge branch 'develop'

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") + "】、");
             }

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));

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");