From 005418d1eb0833e7f8b88e98f78a2a511f9874ed Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Fri, 20 Apr 2018 17:33:25 +0800 Subject: [PATCH] fix~ --- .../management/clearing/core/impl/CleanServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 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 1393524d6..a7e0060fe 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 @@ -682,11 +682,11 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider } List dateKeysList = new ArrayList<>(); dateKeysList.add("transaction_time"); - if (timezone_client == null) { + if (timezone_client != null) { transactions.parallelStream().forEach(p -> { TimeZoneUtils.switchTimeZone(p, timezone_client, "transaction_time"); }); - //TimeZoneUtils.switchTimeZoneToString(transactions,timezone_client,TimeZoneUtils.PATTERN_DATE,dateKeysList); + TimeZoneUtils.switchTimeZoneToString(transactions,timezone_client,TimeZoneUtils.PATTERN_DATE,dateKeysList); } Map> dayTransactionsMap = transactions.stream().collect(Collectors.groupingBy(x -> x.getString("transaction_time").substring(0,10))); @@ -694,9 +694,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider for (Map.Entry> entry : dayTransactionsMap.entrySet()){ JSONObject analysis = new JSONObject(); List transactionsOfDay = entry.getValue(); - /*if(entry.getKey().equals("2017-11-20")){ - int i = 0; - }*/ + BigDecimal total_credit = transactionsOfDay.stream().filter(t->t.getString("transaction_type").equals("Credit")).filter(t->t.containsKey("clearing_amount")).map(t-> t.getBigDecimal("clearing_amount")).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal total_debit = transactionsOfDay.stream().filter(t->t.getString("transaction_type").equals("Debit")).filter(t->t.containsKey("clearing_amount")).map(t-> t.getBigDecimal("clearing_amount")).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal total_charge_credit = transactionsOfDay.stream().filter(t->t.getString("transaction_type").equals("Credit")).filter(t->t.containsKey("total_surcharge")).map(t-> t.getBigDecimal("total_surcharge")).reduce(BigDecimal.ZERO, BigDecimal::add);