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

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

diff --git a/pom.xml b/pom.xml
index 67bde6874..cbfe4ba4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.88</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/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());