settle page, download single settle batch files

src/main/java/au/com/royalpay/payment/manage/management/clearing/core/CleanService.java

@@ -49,6 +49,8 @@ public interface CleanService {
 
     void settlementAba(Date date, HttpServletResponse response) throws IOException;
 
+    void getSettlementFilesForBatch(String batchId, HttpServletResponse resp) throws IOException;
+
     List<JSONObject> getCleanLogs(ClearingLogQuery query, JSONObject manager);
 
     JSONObject getCleanLogsInClients(ClearingLogQuery query, JSONObject manager);

src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java

@@ -382,19 +382,23 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         ZipOutputStream zos = new ZipOutputStream(ous);
         logger.info("using newest version test");
         for (JSONObject log : logs) {
-            String dateString = DateFormatUtils.format(log.getDate("operate_time"), "yyyyMMddHHmmss");
             List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id"));
+            exportAllBankXlsFiles(zos, details, log.getDate("operate_time"));
+        }
+        zos.flush();
+        IOUtils.closeQuietly(zos);
+    }
+
+    private void exportAllBankXlsFiles(ZipOutputStream zos, List<JSONObject> details, Date operateTime) throws IOException {
+        String dateString = DateFormatUtils.format(operateTime, "yyyyMMddHHmmss");
         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);
+            byte[] xlsx = generateSettleXlsxFile(operateTime, details, bank);
             IOUtils.write(xlsx, zos);
         }
     }
-        zos.flush();
-        IOUtils.closeQuietly(zos);
-    }
 
     @Override
     public List<JSONObject> getXlsx(Date dt, String bank) throws IOException {
@@ -441,8 +445,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
     }
 
     private byte[] generateSettleXlsxFile(Date dt, List<JSONObject> settlements, String bank) throws IOException {
-        Workbook wb = new XSSFWorkbook();
+        try (Workbook wb = new XSSFWorkbook()) {
-        Sheet sheet = wb.createSheet("Merchant_Settlement_Info_" + DateFormatUtils.format(dt, "yyyyMM"));
+            Sheet sheet = wb.createSheet("Merchant_Settlement_Info_" + DateFormatUtils.format(dt, "yyyyMMdd"));
             int rowNum = 0;
             for (JSONObject settle : settlements) {
                 if (settle.getBigDecimal("clearing_amount").compareTo(BigDecimal.ZERO) == 0) {
@@ -462,6 +466,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
             bos.flush();
             return bos.toByteArray();
         }
+    }
 
     @Override
     public void settlementAba(Date dt, HttpServletResponse resp) throws IOException {
@@ -501,6 +506,32 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
         }
     }
 
+    @Override
+    public void getSettlementFilesForBatch(String batchId, HttpServletResponse resp) throws IOException {
+        int clearingId = Integer.parseInt(batchId);
+        JSONObject clearing = clearingLogMapper.findById(clearingId);
+        if (clearing == null) {
+            throw new NotFoundException("Clearing batch " + batchId + " not found");
+        }
+        List<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(clearingId);
+        Date settleDate = clearing.getDate("settle_date");
+        Date opTime = clearing.getDate("operate_time");
+        String zipName = "Merchant_Settlement_Info_" + DateFormatUtils.format(opTime, "yyyyMMddHHmmss") + "_all.zip";
+        resp.setContentType("application/octet-stream;");
+        resp.addHeader("Content-Disposition", "attachment; filename=" + zipName);
+        OutputStream ous = resp.getOutputStream();
+
+        List<ABAFile> abaFiles = generateSettleAbaFiles(settleDate, details, opTime);
+        try (ZipOutputStream zos = new ZipOutputStream(ous)) {
+            for (ABAFile aba : abaFiles) {
+                zos.putNextEntry(new ZipEntry(aba.filename()));
+                IOUtils.write(aba.output(1), zos);
+            }
+            exportAllBankXlsFiles(zos, details, opTime);
+            zos.flush();
+        }
+    }
+
     private List<ABAFile> generateSettleAbaFiles(Date dt, List<JSONObject> settlements, Date operateTime) {
         List<String> banks = settlements.stream().map(detail -> detail.getString("settle_bank")).distinct().collect(Collectors.toList());
         return banks.stream().map(bank -> generateSettleAbaFile(bank, dt, settlements)).peek(file -> file.setOperateTime(operateTime)).collect(Collectors.toList());

src/main/java/au/com/royalpay/payment/manage/management/clearing/web/SettlementDevController.java

@@ -156,6 +156,11 @@ public class SettlementDevController {
         }
     }
 
+    @RequestMapping("/settle_batches/{batchId}/settle_files")
+    public void getSettlementFilesForBatch(@PathVariable String batchId, HttpServletResponse resp) throws IOException {
+        cleanService.getSettlementFilesForBatch(batchId, resp);
+    }
+
     @RequestMapping("/details/{detailId}")
     public JSONObject settlementDetail(@PathVariable int detailId, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
         return cleanService.getCleanLogTransactions(detailId, manager);

src/main/ui/static/analysis/clearing-log.js

@@ -257,6 +257,10 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 ];
             }
 
+            $scope.reloadPage = function () {
+                $state.reload();
+            };
+
             $scope.settleAnalysis = getAnalysisTemplate();
 
             $scope.batchAnalysis = {
@@ -292,7 +296,6 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
             };
 
 
-
             angular.forEach($scope.detail.details, function (settleItem) {
                 var settleDays = settleItem.clear_days;
                 attachAnalysis($scope.settleAnalysis[Math.min(settleDays - 1, 2)]);

src/main/ui/static/analysis/templates/settlement_detail.html

@@ -40,6 +40,9 @@
                         ng-disabled="noticeResend">
                     Send Settlement Notice
                 </button>
+                <button class="btn btn-success pull-right" ng-click="reloadPage()">
+                    <i class="fa fa-refresh"></i>Reload
+                </button>
             </div>
         </div>
 
@@ -152,6 +155,11 @@
                     </div>
                 </div>
             </div>
+            <div class="box-footer" ng-if="analysisFilter.clearing_id!=null">
+                <a class="btn btn-primary" ng-href="/sys/settlement/settle_batches/{{analysisFilter.clearing_id}}/settle_files" target="_blank">
+                    Download Files
+                </a>
+            </div>
         </div>
 
         <div class="row">