From 2d47d888b36277e37c9dceb871f7b6ab104ab9d0 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 13 Jan 2020 21:30:47 +0800
Subject: [PATCH] fix order source

---
 pom.xml                                       |  2 +-
 .../manage/merchants/core/ClientManager.java  |  2 ++
 .../core/impls/ClientManagerImpl.java         | 30 +++++++++++++++++++
 .../web/PartnerManageController.java          |  2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 28b9a4dbc..aa1796787 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.18</version>
+    <version>1.3.19</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
index 86b5a863a..e5ae1cf5c 100644
--- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
+++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
@@ -264,6 +264,8 @@ public interface ClientManager {
 
     void uploadAuthFiles(JSONObject manager, String clientMoniker, ClientAuthFilesInfo filesInfo);
 
+    void uploadAuthFilesManager(JSONObject manager, String clientMoniker, ClientAuthFilesInfo filesInfo);
+
     void uploadKycFiles(JSONObject manager, String clientMoniker, ClientKycFilesInfo filesInfo);
 
     List<JSONObject> uploadKycFilesForWaitCompliance(JSONObject manager, String clientMoniker, ClientKycFilesInfo filesInfo);
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 2cd034b97..be0ac7793 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
@@ -3637,6 +3637,36 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         }
     }
 
+    @Override
+    @Transactional
+    public void uploadAuthFilesManager(JSONObject manager, String clientMoniker, ClientAuthFilesInfo filesInfo) {
+        JSONObject client = getClientInfoByMoniker(clientMoniker);
+        if (client == null) {
+            throw new InvalidShortIdException();
+        }
+        int clientId = client.getIntValue("client_id");
+        try {
+            updateSysClientFiles(manager, clientId, CLIENT_AGREE_FILE, filesInfo.getFile_agreement_info());
+            updateSysClientFiles(manager, clientId, CLIENT_APPLY_FILE, filesInfo.getFile_apply_info());
+            updateSysClientFiles(manager, clientId, CLIENT_BANK_FILE, filesInfo.getFile_bank_info());
+            updateSysClientFiles(manager, clientId, CLIENT_COMPANY_FILE, filesInfo.getFile_company_info());
+            updateSysClientFiles(manager, clientId, CLIENT_ID_FILE, filesInfo.getFile_id_info());
+            updateSysClientFiles(manager, clientId, KYC_UTILITY_BILL_FILE, filesInfo.getUtility_bill_info());
+        } catch (Exception e) {
+            logger.error("上传合规文件失败", e);
+        }
+        // boolean clientSource = client.getIntValue("source") == 4 ? true : false;
+        // if (filesInfo.getAuthStatus() == 1 && clientSource) {
+        // client.put("approve_result", 3);
+        // clientMapper.update(client);
+        // }
+        JSONObject params = filesInfo.toIdInfoJson();
+        if (params != null) {
+            params.put("display_name", manager.getString("display_name"));
+            clientApproveIdInfo(params, client);
+        }
+    }
+
     @Override
     @Transactional
     public void uploadKycFiles(JSONObject manager, String clientMoniker, ClientKycFilesInfo filesInfo) {
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 1339d9dcc..dc7606d84 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
@@ -559,7 +559,7 @@ public class PartnerManageController {
     @ManagerMapping(value = "/{clientMoniker}/file", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER})
     public void uploadAuthFiles(@PathVariable String clientMoniker, @RequestBody ClientAuthFilesInfo filesInfo,
                                 @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
-        clientManager.uploadAuthFiles(manager, clientMoniker, filesInfo);
+        clientManager.uploadAuthFilesManager(manager, clientMoniker, filesInfo);
     }
 
     @ManagerMapping(value = "/{clientMoniker}/kycFile", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR, ManagerRole.BD_USER})