|
|
|
@ -536,8 +536,9 @@ public class TradeLogServiceImpl implements TradeLogService {
|
|
|
|
|
JSONObject mchConfig = merchantInfoProvider.getMchExtParams(partner.getIntValue("client_id"));
|
|
|
|
|
params.put("hide_sub_mch", mchConfig.getBooleanValue("hide_sub_mch"));
|
|
|
|
|
|
|
|
|
|
List<JSONObject> logs = transactionMapper.listTransFlowPage(params,
|
|
|
|
|
new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc")));
|
|
|
|
|
// PageList<JSONObject> logs = transactionMapper.listTransFlowPage(params,
|
|
|
|
|
// new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc")));
|
|
|
|
|
List<JSONObject> logs = transactionMapper.listTransFlow(params);
|
|
|
|
|
TimeZoneUtils.switchTimeZone(logs, timezone, "create_time", "confirm_time", "transaction_time");
|
|
|
|
|
Paginator paginator = new Paginator(query.getPage(), query.getLimit(), logs.size());
|
|
|
|
|
List<JSONObject> pagedLogsList = logs.stream()
|
|
|
|
|