fix 清算文件excel下载

master
luoyang 6 years ago
parent d158177fb5
commit 1039a5a43c

@ -1209,6 +1209,9 @@ public class TradeLogServiceImpl implements TradeLogService {
String end = query.getDateto() == null ?"":query.getDateto(); String end = query.getDateto() == null ?"":query.getDateto();
String timezone = partner.getJSONObject("client").getString("timezone"); String timezone = partner.getJSONObject("client").getString("timezone");
JSONObject params = query.toParams(timezone); JSONObject params = query.toParams(timezone);
if (params.get("client_ids") == null) {
params.put("client_id",partner.getJSONObject("client").getString("client_id"));
}
List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params); List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
List<Integer> clientOrders = new ArrayList<>(clientOrderList.size()); List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
clientOrderList.parallelStream().forEach(p->{ clientOrderList.parallelStream().forEach(p->{
@ -1302,7 +1305,9 @@ public class TradeLogServiceImpl implements TradeLogService {
JSONObject client = partner.getJSONObject("client"); JSONObject client = partner.getJSONObject("client");
String timezone = client.getString("timezone"); String timezone = client.getString("timezone");
JSONObject params = query.toParams(timezone); JSONObject params = query.toParams(timezone);
params.put("client_id",client.getString("client_id")); if (params.get("client_ids") == null) {
params.put("client_id",client.getString("client_id"));
}
List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params); List<JSONObject> clientOrderList = transactionMapper.getClientOrderByTransactionTime(params);
List<Integer> clientOrders = new ArrayList<>(clientOrderList.size()); List<Integer> clientOrders = new ArrayList<>(clientOrderList.size());
clientOrderList.parallelStream().forEach(p->{ clientOrderList.parallelStream().forEach(p->{

Loading…
Cancel
Save