From 1837cf3e80f940aa720a102e20dc4cb16c867bec Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 4 Mar 2020 16:42:00 +0800
Subject: [PATCH] =?UTF-8?q?add=20rsvc=E5=A2=9E=E5=8A=A0abn\acn=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pom.xml b/pom.xml
index 3c86833f5..b89e1d4ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.81</version>
+    <version>1.3.82</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 276ad74ee..1ca80e1cb 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
@@ -96,4 +96,6 @@ public class RSvcMchBean {
      * abn
      */
     private String abn;
+
+    private String acn;
 }
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 84eddb7b2..0b67f0874 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
@@ -6616,6 +6616,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         svcMchBean.setAccountName(mchInfo.getString("account_name"));
         svcMchBean.setTelNumber(mchInfo.getString("bank_phone"));
         svcMchBean.setAbn(mchInfo.getString("abn"));
+        svcMchBean.setAcn(mchInfo.getString("acn"));
         return svcMchBean;
     }
 
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
index 466e91c9c..ad9f35b07 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientAccountMapper.xml
@@ -55,7 +55,8 @@
             sc.contact_person,
             sc.contact_phone,
             sc.contact_email,
-            IFNULL( sc.abn, sc.acn ) abn,
+            IFNULL(sc.abn,'') abn,
+            IFNULL(sc.acn,'') acn,
             sba.bsb_no,
             sba.account_name,
             sba.account_no,