From 6efe8ce301dd52f31772c506a7e7db1f05ac038d Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 11 Mar 2020 15:28:50 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=95=86=E6=88=B7=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E9=85=8D=E7=BD=AE=20hide=5Fmch=5Fdevice=20=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 2 +-
 .../manage/merchants/core/impls/ClientManagerImpl.java    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9246a3a01..6d12444c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.95</version>
+    <version>1.3.96</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
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 aee9245cc..8814fd540 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
@@ -2684,6 +2684,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         checkOrgPermission(manager, client);
         JSONObject params = new JSONObject();
         params.put("client_id", client.getIntValue("client_id"));
+        JSONObject mchConfig = merchantInfoProvider.getMchExtParams(client.getIntValue("client_id"));
+        if (mchConfig.getBooleanValue("hide_mch_device")) {
+            return new JSONObject();
+        }
         if (remark != null) {
             params.put("remark", remark);
         }
@@ -2707,6 +2711,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         checkOrgPermission(null, client);
+        JSONObject mchConfig = merchantInfoProvider.getMchExtParams(client.getIntValue("client_id"));
+        if (mchConfig.getBooleanValue("hide_mch_device")) {
+            return new JSONObject();
+        }
         JSONObject params = new JSONObject();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         sdf.setTimeZone(TimeZone.getTimeZone(client.getString("timezone") != null ? client.getString("timezone") : "Australia/Melbourne"));