Merge branch 'h1' into develop

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<JSONObject> details = clearingDetailMapper.listReportsOfSettlement(log.getIntValue("clearing_id"));

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<JSONObject> logs = transactionMapper.listTransFlow(params);
-        logs.stream().forEach(p -> {
+        if (client_id!=1563){
-            String login_id = p.getString("login_id");
+            logs.stream().forEach(p -> {
-            if (StringUtils.isNotEmpty(login_id)) {
+                String login_id = p.getString("login_id");
-                p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")) + "(alipay_id:" + 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);