From 12a510e30ef60efb4e53e645aedf1266da5e8302 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 23 Jul 2018 16:20:28 +0800
Subject: [PATCH 1/3] fix html

---
 src/main/ui/merchant_application.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html
index 227880e34..27306eb96 100644
--- a/src/main/ui/merchant_application.html
+++ b/src/main/ui/merchant_application.html
@@ -798,6 +798,11 @@
                         </div>
                     </form>
                 </div>
+                <div style="margin-top: 25px;" ng-show="chooseArray[0]">
+                    <a class="text-primary" style="font-size: 14px;text-shadow: #000" target="_blank" href="https://www.globalfreepay.com/">
+                        Application Entrance for Non-Australian Merchant>>
+                    </a>
+                </div>
             </div>
 
             <div class="modal fade">

From 8e13ac7452a7220ea944f02de6f1dffc1b94c188 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Mon, 23 Jul 2018 17:14:22 +0800
Subject: [PATCH 2/3] fix html

---
 src/main/ui/merchant_application.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/merchant_application.html b/src/main/ui/merchant_application.html
index 27306eb96..16d8804e7 100644
--- a/src/main/ui/merchant_application.html
+++ b/src/main/ui/merchant_application.html
@@ -800,7 +800,7 @@
                 </div>
                 <div style="margin-top: 25px;" ng-show="chooseArray[0]">
                     <a class="text-primary" style="font-size: 14px;text-shadow: #000" target="_blank" href="https://www.globalfreepay.com/">
-                        Application Entrance for Non-Australian Merchant>>
+                        Application Entrance for Non-Australian Merchants>>
                     </a>
                 </div>
             </div>

From de1c415a2dbc63521edf26306fb3b5188112f2de Mon Sep 17 00:00:00 2001
From: yixian <astro.dai@royalpay.com.au>
Date: Tue, 24 Jul 2018 13:58:28 +0800
Subject: [PATCH 3/3] split bank in download xlsx

---
 .../clearing/core/impl/CleanServiceImpl.java          | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
index 6431ae5e8..a118d83cc 100644
--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@@ -342,11 +342,14 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         ZipOutputStream zos = new ZipOutputStream(ous);
         for (JSONObject log : logs) {
             String dateString = DateFormatUtils.format(log.getDate("operate_time"), "yyyyMMddHHmmss");
-            String filename = "Merchant_Settlement_Info_" + dateString + RandomStringUtils.random(8, false, true) + ".xlsx";
-            zos.putNextEntry(new ZipEntry(filename));
             List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id"));
-            byte[] xlsx = generateSettleXlsxFile(dt, details, null);
-            IOUtils.write(xlsx, zos);
+            List<String> bankList = details.stream().map(detail -> detail.getString("settle_bank")).distinct().collect(Collectors.toList());
+            for (String bank : bankList) {
+                String filename = "Merchant_Settlement_Info_" + dateString + "_" + bank + ".xlsx";
+                zos.putNextEntry(new ZipEntry(filename));
+                byte[] xlsx = generateSettleXlsxFile(dt, details, bank);
+                IOUtils.write(xlsx, zos);
+            }
         }
         zos.flush();
         IOUtils.closeQuietly(zos);