From 5b8bfad73ddb807bbdf1b303a5e29e7b8e91a7f5 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Thu, 12 Apr 2018 17:40:38 +0800 Subject: [PATCH 1/2] bug fix --- .../manage/tradelog/core/impls/TradeLogServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 3862de24a..207f00f9a 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 @@ -469,8 +469,7 @@ public class TradeLogServiceImpl implements TradeLogService { 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+")"); + 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")); From 72e09ceb5555058e9cefb323d9cae1a47600ea53 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Thu, 12 Apr 2018 17:50:11 +0800 Subject: [PATCH 2/2] update --- .../manage/apps/core/impls/CustomerImpressionServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionServiceImpl.java index 724959373..4c0d74786 100644 --- a/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionServiceImpl.java @@ -83,7 +83,6 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService if (!StringUtils.isEmpty(city)) { paymentInfo.put("pay_location", city); } - paymentInfos.add(paymentInfo); }