From 751206814b63153414dea396f004dbca66a22591 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 11 Jun 2018 09:33:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E8=B4=B9=E7=8E=87=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E7=BB=AD=E7=AD=BE=EF=BC=8CGST=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8F=98=E4=B8=BA=E8=87=AA=E5=B7=B1=E6=89=BF=E6=8B=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/manage/task/PostponeClientTask.java        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
index a612bc40a..34f765665 100644
--- a/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
+++ b/src/main/java/au/com/royalpay/payment/manage/task/PostponeClientTask.java
@@ -4,6 +4,8 @@ import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
 import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
+import au.com.royalpay.payment.manage.merchants.core.ClientModifySupport;
+import au.com.royalpay.payment.manage.merchants.entity.impls.SwitchPermissionModify;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
 import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage;
@@ -18,6 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
@@ -47,9 +50,11 @@ public class PostponeClientTask {
     private ManagerMapper managerMapper;
     @Resource
     private SynchronizedScheduler synchronizedScheduler;
-
+    @Resource
+    private ClientModifySupport clientModifySupport;
 
     @Scheduled(cron = "0 30 8 * * ?")
+    @Transactional
     public void postponeClient() {
         synchronizedScheduler.executeProcess("manage_task:postPoneClient", 120_000, () -> {
             Date now = new Date();
@@ -91,6 +96,9 @@ 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));
+                }
                 adminAccounts.forEach(o -> {
                     sendClientPostponeNotify(o, expireDate);
                 });