From 042c95fed11f42a71190bd203128e8609463e14d Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 15 Aug 2019 16:21:49 +0800
Subject: [PATCH] =?UTF-8?q?[Y]=E7=A7=BB=E9=99=A4tax=5Fin=5Fsurcharge?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=9A=E8=B4=B9=E7=8E=87=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E3=80=81=E4=B8=8A=E4=BC=A0=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 .../payment/manage/dev/core/impl/ManualServiceimpl.java         | 1 -
 .../payment/manage/merchants/core/impls/ClientManagerImpl.java  | 2 --
 .../manage/system/core/impl/ClientContractServiceImpl.java      | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 52dd127ca..f169dc9b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.1.15</version>
+    <version>1.1.16</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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..485c09450 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
@@ -108,6 +108,5 @@ public class ManualServiceimpl implements ManualService {
             }
 
         });
-        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 88d98677a..86bb56b45 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
@@ -4997,7 +4997,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 rpayApi.modifySurchargeConfig(clientMapper.findClient(client_id));
             }
         }
-        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, client.getString("client_moniker"), "tax_in_surcharge", false));
         adminAccounts.forEach(o -> {
             sendClientPostponeNotify(o, expireDate);
         });
@@ -5017,7 +5016,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     public boolean postponeClientRate(int clientId, String clientMoniker, String nextYearExipryDate) {
         try {
             clientRateMapper.postponeMerchantRateByClientId(clientId);
-            clientModifySupport.processClientConfigModify(new SwitchPermissionModify(null, clientMoniker, "tax_in_surcharge", false));
             List<JSONObject> adminAccounts = clientAccountMapper.listAdminAccounts(clientId);
             adminAccounts.forEach(o -> {
                 sendClientPostponeNotify(o, nextYearExipryDate);
diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
index b4082fb18..3b9102fbf 100644
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
@@ -104,7 +104,6 @@ public class ClientContractServiceImpl implements ClientContractService {
         contract.put("confirm_time", now);
         contract.put("signatory", account.getString("display_name"));
         clientsContractMapper.update(contract);
-        clientManager.setClientTaxInSurcharge(clientAccountMapper.findById(account_id),client.getString("client_moniker"), false);
     }
 
     @Override