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 c26fdab76..63b0fcc73 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 @@ -66,12 +66,7 @@ public class RetailRSvcServiceImpl implements RetailRSvcService { public JSONObject findMchInfoBySourceCode(JSONObject device, String sourceCode, boolean debug) { String clientType = device.getString("client_type"); deviceSupport.findRegister(clientType); - JSONObject clientConfig = clientConfigMapper.find(device.getIntValue("client_id")); - if (!debug && !clientConfig.getBooleanValue("geek_shop_status") - && device.getIntValue("client_id") != 9 - && device.getIntValue("client_id") != 4181) { - throw new NotFoundException(); - } + JSONObject svcInfo = commonIncrementalChannelMapper.findIncreamentalChannelBySourceCode(sourceCode); if (svcInfo == null || StringUtils.isEmpty(svcInfo.getString("channel_pub_key")) || StringUtils.isEmpty(svcInfo.getString("platform_pub_key")) || StringUtils.isEmpty("platform_pri_key")) {