Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage

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);
+            List<String> bankList = details.stream().map(detail -> detail.getString("settle_bank")).distinct().collect(Collectors.toList());
-            IOUtils.write(xlsx, zos);
+            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);

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 Merchants>>
+                    </a>
+                </div>
             </div>
 
             <div class="modal fade">