From 625f86c17c80aafc176de0f2dc0c0db7535a77fe Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 7 May 2020 13:37:32 +0800
Subject: [PATCH 1/4] update 2.1.39

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 82258ddde..43ebf26b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>2.1.38</version>
+        <version>2.1.39</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.2.29</version>
+    <version>2.2.30</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>

From 6ee320d3292000c86d96d963803abea91b1ee657 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 7 May 2020 15:02:47 +0800
Subject: [PATCH 2/4] fix abn

---
 src/main/ui/static/payment/partner/templates/add_partner.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html
index cd24bc7f2..952266506 100644
--- a/src/main/ui/static/payment/partner/templates/add_partner.html
+++ b/src/main/ui/static/payment/partner/templates/add_partner.html
@@ -220,7 +220,7 @@
                             <div class="form-group"
                                  ng-class="{'has-error':partnerForm.abn.$invalid && partnerForm.abn.$dirty}"
                                  ng-if="partner.business_structure != 'Company' || partner.enable_card_payment">
-                                <label class="control-label col-sm-2" for="abn-input"><span ng-if="partner.enable_card_payment">*</span>ABN</label>
+                                <label class="control-label col-sm-2" for="abn-input">* ABN</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="partner.abn" type="text"
                                            name="abn" required

From 9bc1101bdf2956b09b9c58670d18685eb13710c5 Mon Sep 17 00:00:00 2001
From: dulingling <dll19920503@qq.com>
Date: Thu, 7 May 2020 16:57:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?Upd=EF=BC=9AApp=E6=AF=8F=E6=97=A5=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E9=A2=9D,=E8=BF=9B=E8=A1=8C=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E4=BF=9D=E7=95=992=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                   | 2 +-
 .../manage/appclient/core/impls/RetailAppServiceImp.java  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 43ebf26b5..1a7bc9045 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.2.30</version>
+    <version>2.2.31</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/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index e027041ff..69ef8d993 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -290,11 +290,11 @@ public class RetailAppServiceImp implements RetailAppService {
             res.put("alipay_rate", paymentApi.channelApi("Alipay").queryExchangeRateDecimal(clientId));
         }
         params.put("channel", "system");
-        res.put("sys_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
+        res.put("sys_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
         params.put("channel", "rpaypmt_card");
-        res.put("rpaypmt_card_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
+        res.put("rpaypmt_card_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
         params.put("channel", "rpaypmt_dd");
-        res.put("rpaypmt_dd_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)));
+        res.put("rpaypmt_dd_not_settled", new BigDecimal(transactionAnalysisMapper.analysisNotSettled(params)).setScale(2, BigDecimal.ROUND_DOWN).toPlainString());
         return res;
     }
 
@@ -870,7 +870,7 @@ public class RetailAppServiceImp implements RetailAppService {
         String clientType = device.getString("client_type");
         deviceSupport.findRegister(clientType);
         int clientId = device.getIntValue("client_id");
-        JSONObject client = clientManager.getClientInfo(9);
+        JSONObject client = clientManager.getClientInfo(clientId);
         String timezoneClient = client.getString("timezone");
         if (timezoneClient != null && !timezone.isEmpty()) {
             timezone = timezoneClient;

From 79aafff62a2a8b598fca2dedebeae55cbc524bac Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Fri, 8 May 2020 09:38:32 +0800
Subject: [PATCH 4/4] update 2.2.32

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1a7bc9045..e3edce957 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.2.31</version>
+    <version>2.2.32</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>