|
|
@ -268,6 +268,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
|
|
|
|
|
|
|
|
|
|
|
|
List<JSONObject> details = new ArrayList<>();
|
|
|
|
List<JSONObject> details = new ArrayList<>();
|
|
|
|
List<JSONObject> totalList = new ArrayList<>();
|
|
|
|
List<JSONObject> totalList = new ArrayList<>();
|
|
|
|
|
|
|
|
int clearingId = 0;
|
|
|
|
for (JSONObject log : logs) {
|
|
|
|
for (JSONObject log : logs) {
|
|
|
|
addBigDecimal(total, log, "total_credit");
|
|
|
|
addBigDecimal(total, log, "total_credit");
|
|
|
|
addBigDecimal(total, log, "total_debit");
|
|
|
|
addBigDecimal(total, log, "total_debit");
|
|
|
@ -278,7 +279,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
|
|
|
|
addBigDecimal(total, log, "total_charge");
|
|
|
|
addBigDecimal(total, log, "total_charge");
|
|
|
|
addBigDecimal(total, log, "charge_cashback");
|
|
|
|
addBigDecimal(total, log, "charge_cashback");
|
|
|
|
addBigDecimal(total, log, "tax_amount");
|
|
|
|
addBigDecimal(total, log, "tax_amount");
|
|
|
|
int clearingId = log.getIntValue("clearing_id");
|
|
|
|
clearingId = log.getIntValue("clearing_id");
|
|
|
|
List<JSONObject> logDetails = clearingDetailMapper.listReportsOfSettlementLimit20(clearingId);
|
|
|
|
List<JSONObject> logDetails = clearingDetailMapper.listReportsOfSettlementLimit20(clearingId);
|
|
|
|
details.addAll(logDetails);
|
|
|
|
details.addAll(logDetails);
|
|
|
|
List<String> banks = logDetails.stream().map(detail -> detail.getString("settle_bank")).distinct().collect(Collectors.toList());
|
|
|
|
List<String> banks = logDetails.stream().map(detail -> detail.getString("settle_bank")).distinct().collect(Collectors.toList());
|
|
|
@ -296,14 +297,12 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
|
|
|
|
.count());
|
|
|
|
.count());
|
|
|
|
return data;
|
|
|
|
return data;
|
|
|
|
}).collect(Collectors.toList());
|
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
|
|
totalList = clearingDetailMapper.listRepostTotal(clearingId);
|
|
|
|
|
|
|
|
//bankStatistics.put()
|
|
|
|
//bankStatistics.put()
|
|
|
|
|
|
|
|
|
|
|
|
log.put("bank_statistics", bankStatistics);
|
|
|
|
log.put("bank_statistics", bankStatistics);
|
|
|
|
log.put("editable", DateUtils.isSameDay(log.getDate("settle_date"), new Date()) && log.getBooleanValue("editable"));
|
|
|
|
log.put("editable", DateUtils.isSameDay(log.getDate("settle_date"), new Date()) && log.getBooleanValue("editable"));
|
|
|
|
log.put("channel_analysis", clearingDetailAnalysisMapper.analysisChannelReport(clearingId));
|
|
|
|
log.put("channel_analysis", clearingDetailAnalysisMapper.analysisChannelReport(clearingId));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
totalList = clearingDetailMapper.listRepostTotal(clearingId);
|
|
|
|
total.put("totalList", totalList);
|
|
|
|
total.put("totalList", totalList);
|
|
|
|
total.put("logs", logs);
|
|
|
|
total.put("logs", logs);
|
|
|
|
total.put("details", details);
|
|
|
|
total.put("details", details);
|
|
|
|