From 4f46380949112bfe93ed5725db7e8d8ef75bc88f Mon Sep 17 00:00:00 2001 From: eason Date: Wed, 25 Jul 2018 14:16:38 +0800 Subject: [PATCH 1/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); From b9398f2cfa901801dfdb4d31637cbbb462a5af7e Mon Sep 17 00:00:00 2001 From: eason Date: Thu, 26 Jul 2018 09:36:45 +0800 Subject: [PATCH 2/2] fix google map key --- src/main/ui/all_locations.html | 2 +- src/main/ui/one_locations.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/ui/all_locations.html b/src/main/ui/all_locations.html index e3930803c..0ead36432 100644 --- a/src/main/ui/all_locations.html +++ b/src/main/ui/all_locations.html @@ -22,7 +22,7 @@