From 7b437690027af8db56b43abf07b34e9f657d6150 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 10 Oct 2019 18:03:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0sub=5Fmanage=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                  | 2 +-
 .../payment/manage/appclient/core/RetailAppService.java  | 2 ++
 .../manage/appclient/core/impls/RetailAppServiceImp.java | 9 +++++++++
 .../manage/appclient/web/RetailAppController.java        | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fc1069091..a07438a41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.27</version>
+    <version>1.2.28</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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 206378602..319e9e108 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
@@ -220,5 +220,7 @@ public interface RetailAppService {
 
     void commitAuthFilesToCompliance(JSONObject device,JSONObject photoInfo);
 
+    JSONObject getClientSubManage(JSONObject device);
+
     boolean isSubPartner(JSONObject device, String clientMoniker);
 }
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 0041dad26..a02734638 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
@@ -2426,6 +2426,15 @@ public class RetailAppServiceImp implements RetailAppService {
         clientManager.commitAuthFilesToCompliance(client.getString("client_moniker"), account, "App");
     }
 
+    public JSONObject getClientSubManage(JSONObject device) {
+        JSONObject result = new JSONObject();
+        String clientType = device.getString("client_type");
+        deviceSupport.findRegister(clientType);
+        JSONObject client = clientManager.getClientInfo(device.getIntValue("client_id"));
+        result.put("sub_manage", client.getBooleanValue("sub_manage"));
+        return result;
+    }
+
     @Override
     public boolean isSubPartner(JSONObject device,String clientMoniker) {
         JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
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 e21ca8464..b521280aa 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
@@ -838,4 +838,9 @@ public class RetailAppController {
     public void commitToComplianceAuthFiles(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, @RequestBody JSONObject photoInfo) {
         retailAppService.commitAuthFilesToCompliance(device, photoInfo);
     }
+
+    @GetMapping("/client/sub_manage")
+    public JSONObject getClientSubManage(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
+        return retailAppService.getClientSubManage(device);
+    }
 }