bug fix

src/main/java/au/com/royalpay/payment/manage/activities/monsettledelay/core/impls/ActMonDelaySettleServiceImp.java

@@ -152,7 +152,7 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         device.put("rate", params.getBigDecimal("rate") == null ? new BigDecimal(0.15) : params.getBigDecimal("rate"));
         device.put("expire_time", act.getDate("expire_date"));
         actMonDelaySettleMapper.save(device);
-        clientManager.changeManualSettle(client_id,true,device.getString("account_id"),1,"参加活动打开手动清算");
+        clientManager.changeManualSettle(account,client_id,true,device.getString("account_id"),1,"参加活动打开手动清算");
 
     }
 
@@ -174,7 +174,8 @@ public class ActMonDelaySettleServiceImp implements ActMonDelaySettleService {
         clientLog.put("is_valid", 0);
         clientLog.put("expire_time", new Date());
         actMonDelaySettleMapper.update(clientLog);
-        clientManager.changeManualSettle(client_id,false,device.getString("account_id"),1,"退出活动关闭手动清算");
+        JSONObject account = clientAccountMapper.findById(device.getString("account_id"));
+        clientManager.changeManualSettle(account,client_id,false,device.getString("account_id"),1,"退出活动关闭手动清算");
     }
 
      private void recodeActClient(JSONObject device){

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -1542,7 +1542,8 @@ public class RetailAppServiceImp implements RetailAppService {
 
     @Override
     public void changeManualSettle(JSONObject device, boolean manual_settle) {
-        clientManager.changeManualSettle(device.getIntValue("client_id"), manual_settle, device.getString("account_id"), 1, "商户"+(manual_settle?"打开":"关闭")+"手动清算");
+        JSONObject account = clientAccountMapper.findById(device.getString("account_id"));
+        clientManager.changeManualSettle(account,device.getIntValue("client_id"), manual_settle, device.getString("account_id"), 1, "商户"+(manual_settle?"打开":"关闭")+"手动清算");
     }
 
 

src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java

@@ -229,7 +229,7 @@ public interface ClientManager {
 
     void changePaymentPage(JSONObject account, String paypad_version);
 
-    void changeManualSettle(int client_id, boolean manual_settle,String operator_id,int type,String operation);
+    void changeManualSettle(JSONObject account , int client_id, boolean manual_settle,String operator_id,int type,String operation);
 
     void changeQRCodePaySurcharge(JSONObject account, boolean paySurcharge);
 

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -2676,16 +2676,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
 
     @Override
     @Transactional
-    public void changeManualSettle(int client_id, boolean manual_settle, String operator_id, int type, String operation) {
+    public void changeManualSettle(JSONObject account,int client_id, boolean manual_settle, String operator_id, int type, String operation) {
         JSONObject client = getClientInfo(client_id);
         if (client == null) {
             throw new BadRequestException("merchant not found");
         }
-        JSONObject record = new JSONObject();
+        clientModifySupport.processClientConfigModify(new SwitchPermissionModify(account,client.getString("client_moniker"),"manual_settle",manual_settle));
-        record.put("client_id", client_id);
-        record.put("manual_settle", manual_settle);
-        clientConfigService.update(record);
-
         JSONObject actClientLog = new JSONObject();
         actClientLog.put("client_id", client_id);
         actClientLog.put("operator_id", operator_id);

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java

@@ -365,7 +365,7 @@ public class PartnerViewController {
     @PartnerMapping(value = "/manual_settle", method = RequestMethod.PUT, roles = PartnerRole.ADMIN)
     @ResponseBody
     public void manualSettle(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @RequestParam boolean manual_settle) {
-        clientManager.changeManualSettle(account.getIntValue("client_id"), manual_settle, account.getString("account_id"), 1, "商户" + (manual_settle ? "打开" : "关闭") + "手动清算");
+        clientManager.changeManualSettle(account,account.getIntValue("client_id"), manual_settle, account.getString("account_id"), 1, "商户" + (manual_settle ? "打开" : "关闭") + "手动清算");
     }
 
     @PartnerMapping(value = "/checkContract", method = RequestMethod.GET)