From a2b36ec297911954ce1cf6d65c41ea3388effbc2 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Wed, 21 Mar 2018 10:29:43 +0800
Subject: [PATCH] update

---
 .../payment/manage/appclient/core/RetailAppService.java    | 2 ++
 .../manage/appclient/core/impls/RetailAppServiceImp.java   | 5 +++++
 .../payment/manage/appclient/web/RetailAppController.java  | 7 +++++++
 .../manage/merchants/web/PartnerManageController.java      | 2 +-
 .../manage/merchants/web/PartnerViewController.java        | 1 -
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
index 0f1f5213b..309a2af8f 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
@@ -115,4 +115,6 @@ public interface RetailAppService {
 
     JSONObject getCheckClientInfo(JSONObject device);
 
+    void changeManualSettle(JSONObject device,boolean manual_settle);
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index 857e5d35a..0a9bf4bec 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -1385,6 +1385,11 @@ public class RetailAppServiceImp implements RetailAppService {
         return clientManager.getCheckClientInfo(device.getIntValue("client_id"), device.getString("account_id"));
     }
 
+    @Override
+    public void changeManualSettle(JSONObject device,boolean manual_settle) {
+        clientManager.changeManualSettle(device.getIntValue("client_id"),manual_settle,device.getString("account_id"),1,"商户修改手动清算配置");
+    }
+
     private static boolean mathchLetterorNum(String str) {
         String regex = "[A-Za-z0-9]{8}";
         return str.matches(regex);
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
index e6dea762c..b127b7898 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
@@ -381,4 +381,11 @@ public class RetailAppController {
     public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
         clientContractService.confirmSourceAgreement(device.getIntValue("client_id"),device.getString("account_id"),"App");
     }
+
+
+    @RequestMapping(value = "/manual_settle", method = RequestMethod.PUT)
+    public void confirmSourceAgreeFile(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device,@RequestParam boolean manual_settle) {
+        retailAppService.changeManualSettle(device,manual_settle);
+    }
+
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
index a2b6671b1..14c71d748 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
@@ -527,7 +527,7 @@ public class PartnerManageController {
     @ManagerMapping(value = "/{clientMoniker}/manual_settle",method = RequestMethod.PUT,role = {ManagerRole.OPERATOR,ManagerRole.ADMIN})
     public void manualSettle(@PathVariable String clientMoniker, @RequestParam boolean manual_settle, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
-        clientManager.changeManualSettle(client.getIntValue("client_id"),manual_settle,manager.getString("manager_id"),2,"运营人员修改");
+        clientManager.changeManualSettle(client.getIntValue("client_id"),manual_settle,manager.getString("manager_id"),2,"运营人员修改手动清算配置");
     }
 
     @PartnerMapping(value = "/check", method = RequestMethod.GET)
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
index 6463c75e4..223dc2858 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java
@@ -362,7 +362,6 @@ 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,"商户修改修改");
     }