Merge remote-tracking branch 'origin/develop' into develop

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);
 
         }

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"));