From b7736f331805a0c8a626e84bd2d0ae6daea0e750 Mon Sep 17 00:00:00 2001 From: yixian Date: Wed, 25 Jul 2018 10:16:18 +0800 Subject: [PATCH 1/2] split bank in download xlsx --- .../manage/management/clearing/core/impl/CleanServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 59b644bc6..34c828f70 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 @@ -340,6 +340,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider resp.addHeader("Content-Disposition", "attachment; filename=" + zipName); OutputStream ous = resp.getOutputStream(); 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 details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id")); From 4f46380949112bfe93ed5725db7e8d8ef75bc88f Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 25 Jul 2018 14:16:38 +0800 Subject: [PATCH 2/2] fix excel remark --- .../tradelog/core/impls/TradeLogServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index 337e2044e..98ca78c70 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -479,12 +479,14 @@ public class TradeLogServiceImpl implements TradeLogService { clientManager.validateClients(client_id, params); params.put("client_id", client_id); List logs = transactionMapper.listTransFlow(params); - logs.stream().forEach(p -> { - String login_id = p.getString("login_id"); - if (StringUtils.isNotEmpty(login_id)) { - p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")) + "(alipay_id:" + login_id + ")"); - } - }); + if (client_id!=1563){ + logs.stream().forEach(p -> { + String login_id = p.getString("login_id"); + if (StringUtils.isNotEmpty(login_id)) { + p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")) + "(alipay_id:" + login_id + ")"); + } + }); + } TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Arrays.asList("transaction_time")); final JSONObject analysis = analysisTransLogs(logs);