|
|
|
@ -571,6 +571,7 @@ public class TradeLogServiceImpl implements TradeLogService {
|
|
|
|
|
params.put("client_id", clientId);
|
|
|
|
|
JSONObject mchConfig = merchantInfoProvider.getMchExtParams(partner.getIntValue("client_id"));
|
|
|
|
|
params.put("hide_sub_mch", mchConfig.getBooleanValue("hide_sub_mch"));
|
|
|
|
|
params.put("channel", channels);
|
|
|
|
|
clientManager.queryModifyClientIds(clientId, params);
|
|
|
|
|
List<JSONObject> logs = transactionMapper.listTransFlow(params);
|
|
|
|
|
TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Collections.singletonList("transaction_time"));
|
|
|
|
@ -775,7 +776,7 @@ public class TradeLogServiceImpl implements TradeLogService {
|
|
|
|
|
) {
|
|
|
|
|
List<JSONObject> dataList = transFlow.getJSONArray("data").toJavaList(JSONObject.class);
|
|
|
|
|
JSONObject parmerters = new JSONObject();
|
|
|
|
|
parmerters.put("records",dataList.size());
|
|
|
|
|
parmerters.put("records", dataList.size());
|
|
|
|
|
parmerters.put("dateFrom", StringUtils.isNotBlank(query.getDatefrom())
|
|
|
|
|
? DateFormatUtils.format(DateUtils.parseDate(query.getDatefrom(), "yyyyMMdd"), "dd/MM/yyyy") : "");
|
|
|
|
|
parmerters.put("dateTo",
|
|
|
|
|