From 5fb3e409da2080da4a9f9e416c547d7fecb29068 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 6 Mar 2020 12:13:05 +0800
Subject: [PATCH] add shortname rsvc

---
 pom.xml                                                     | 2 +-
 .../payment/manage/appclient/beans/RSvcMchBean.java         | 4 ++++
 .../manage/appclient/core/impls/RetailRSvcServiceImpl.java  | 6 +++---
 .../manage/merchants/core/impls/ClientManagerImpl.java      | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 415730784..cbfe4ba4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.87</version>
+    <version>1.3.89</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/beans/RSvcMchBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java
index 1ca80e1cb..94e3bb9f0 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/RSvcMchBean.java
@@ -47,6 +47,10 @@ public class RSvcMchBean {
      * 商户名称
      */
     private String merchantName;
+    /**
+     * 商户shortname名称
+     */
+    private String shortName;
     /**
      * 公司地址 address
      */
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 2c5124683..1e220b6c3 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,6 +11,7 @@ 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;
@@ -47,9 +48,8 @@ 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") && device.getIntValue("client_id")==9) {
-//            throw new NotFoundException();
-            return new JSONObject();
+        if (!debug && !clientConfig.getBooleanValue("geek_shop_status") && device.getIntValue("client_id") != 9) {
+            throw new NotFoundException();
         }
         JSONObject svcInfo = commonIncrementalChannelMapper.findIncreamentalChannelBySourceCode(sourceCode);
         if (svcInfo == null || StringUtils.isEmpty(svcInfo.getString("channel_pub_key"))
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 ecbe77194..c795264cb 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
@@ -6599,6 +6599,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         RSvcMchBean svcMchBean = new RSvcMchBean();
         svcMchBean.setMerchantNumber(mchInfo.getString("username"));
         svcMchBean.setMerchantName(mchInfo.getString("company_name"));
+        svcMchBean.setShortName(mchInfo.getString("short_name"));
         svcMchBean.setPartnerCode(mchInfo.getString("client_moniker"));
         svcMchBean.setCredentialCode(mchInfo.getString("credential_code"));
         svcMchBean.setPayHost(PlatformEnvironment.getEnv().mainHost());