Merge branch 'hotfix' into develop

src/main/java/au/com/royalpay/payment/manage/dev/core/impl/ManualServiceimpl.java

@@ -84,9 +84,7 @@ public class ManualServiceimpl implements ManualService {
                     clientRateMapper.saveRate(record);
 
                 });
-                if(p.getBooleanValue("tax_in_surcharge")){
-                    clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null,p.getString("client_moniker"),"tax_in_surcharge",false));
-                }
+                clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
             });
         });
         logger.info("end doing client postpone");

src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java

@@ -97,9 +97,7 @@ public class PostponeClientTask {
                     clientRateMapper.saveRate(record);
 
                 });
-                if(p.getBooleanValue("tax_in_surcharge")){
-                    clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null,p.getString("client_moniker"),"tax_in_surcharge",false));
-                }
+                clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, p.getString("client_moniker"), "tax_in_surcharge", false));
                 adminAccounts.forEach(o -> {
                     sendClientPostponeNotify(o, expireDate);
                 });
@@ -112,7 +110,7 @@ public class PostponeClientTask {
         JSONObject client = clientManager.getClientInfo(account.getIntValue("client_id"));
 
         try {
-            if(StringUtils.isEmpty(account.getString("wechat_openid"))){
+            if (StringUtils.isEmpty(account.getString("wechat_openid"))) {
                 return;
             }
             MpWechatApi api = mpWechatApiProvider.getApiFromOpenId(account.getString("wechat_openid"));