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 ef03ec115..996bd833a 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 @@ -268,6 +268,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider List details = new ArrayList<>(); List totalList = new ArrayList<>(); + int clearingId = 0; for (JSONObject log : logs) { addBigDecimal(total, log, "total_credit"); addBigDecimal(total, log, "total_debit"); @@ -278,7 +279,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider addBigDecimal(total, log, "total_charge"); addBigDecimal(total, log, "charge_cashback"); addBigDecimal(total, log, "tax_amount"); - int clearingId = log.getIntValue("clearing_id"); + clearingId = log.getIntValue("clearing_id"); List logDetails = clearingDetailMapper.listReportsOfSettlementLimit20(clearingId); details.addAll(logDetails); List banks = logDetails.stream().map(detail -> detail.getString("settle_bank")).distinct().collect(Collectors.toList()); @@ -296,14 +297,12 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider .count()); return data; }).collect(Collectors.toList()); - - totalList = clearingDetailMapper.listRepostTotal(clearingId); //bankStatistics.put() - log.put("bank_statistics", bankStatistics); log.put("editable", DateUtils.isSameDay(log.getDate("settle_date"), new Date()) && log.getBooleanValue("editable")); log.put("channel_analysis", clearingDetailAnalysisMapper.analysisChannelReport(clearingId)); } + totalList = clearingDetailMapper.listRepostTotal(clearingId); total.put("totalList", totalList); total.put("logs", logs); total.put("details", details); diff --git a/src/main/ui/static/analysis/templates/settlement_detail.html b/src/main/ui/static/analysis/templates/settlement_detail.html index 828088d13..e2e10fc4d 100644 --- a/src/main/ui/static/analysis/templates/settlement_detail.html +++ b/src/main/ui/static/analysis/templates/settlement_detail.html @@ -169,8 +169,9 @@ -
-
+
+
Total Amount:
+
  Amounts: