From 7b0162ca4465898257a3c182cb3e53086aecd499 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 5 Mar 2020 15:29:12 +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    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7629cf1ff..415730784 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.86</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 743b7f8e4..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
@@ -11,7 +11,6 @@ import au.com.royalpay.payment.tools.codec.AESCrypt;
 import au.com.royalpay.payment.tools.device.DeviceSupport;
 import au.com.royalpay.payment.tools.encryptalgorithm.SignUtils;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
-import au.com.royalpay.payment.tools.exceptions.NotFoundException;
 import au.com.royalpay.payment.tools.mappers.CommonIncrementalChannelMapper;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -49,7 +48,8 @@ public class RetailRSvcServiceImpl implements RetailRSvcService {
         deviceSupport.findRegister(clientType);
         JSONObject clientConfig = clientConfigMapper.find(device.getIntValue("client_id"));
         if (!debug && !clientConfig.getBooleanValue("geek_shop_status") && device.getIntValue("client_id")==9) {
-            throw new NotFoundException();
+//            throw new NotFoundException();
+            return new JSONObject();
         }
         JSONObject svcInfo = commonIncrementalChannelMapper.findIncreamentalChannelBySourceCode(sourceCode);
         if (svcInfo == null || StringUtils.isEmpty(svcInfo.getString("channel_pub_key"))