From 1e28b924ec89869bc3eb2584819da3590d325b07 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 5 Mar 2020 16:19:44 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B7=A8=E5=A2=83=E5=95=86=E5=9F=8Eapp?=
 =?UTF-8?q?=20=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                      | 2 +-
 .../manage/appclient/core/impls/RetailRSvcServiceImpl.java   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3f708f676..415730784 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.84</version>
+    <version>1.3.87</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/appclient/core/impls/RetailRSvcServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
index 07cd3ef40..2c5124683 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailRSvcServiceImpl.java
@@ -47,8 +47,9 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
         JSONObject clientConfig = clientConfigMapper.find(device.getIntValue("client_id"));
-        if (!debug && !clientConfig.getBooleanValue("geek_shop_status")) {
-            throw new BadRequestException("商户未开店");
+        if (!debug && !clientConfig.getBooleanValue("geek_shop_status") && device.getIntValue("client_id")==9) {
+//            throw new NotFoundException();
+            return new JSONObject();
         }
         JSONObject svcInfo = commonIncrementalChannelMapper.findIncreamentalChannelBySourceCode(sourceCode);
         if (svcInfo == null || StringUtils.isEmpty(svcInfo.getString("channel_pub_key"))