From 754550bcba4c171ecac8f9d35f57a8e602479ced Mon Sep 17 00:00:00 2001 From: luoyang Date: Thu, 4 Apr 2019 10:40:16 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=B8=85=E7=AE=97=E6=96=87=E4=BB=B6excel?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/tradelog/core/impls/TradeLogServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index 5683c4782..3bf72ea5f 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -1209,6 +1209,9 @@ public class TradeLogServiceImpl implements TradeLogService { String end = query.getDateto() == null ?"":query.getDateto(); String timezone = partner.getJSONObject("client").getString("timezone"); JSONObject params = query.toParams(timezone); + if (params.get("client_ids") == null) { + params.put("client_id",partner.getJSONObject("client").getString("client_id")); + } List clientOrderList = transactionMapper.getClientOrderByTransactionTime(params); List clientOrders = new ArrayList<>(clientOrderList.size()); clientOrderList.parallelStream().forEach(p->{ @@ -1302,7 +1305,9 @@ public class TradeLogServiceImpl implements TradeLogService { JSONObject client = partner.getJSONObject("client"); String timezone = client.getString("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 clientOrderList = transactionMapper.getClientOrderByTransactionTime(params); List clientOrders = new ArrayList<>(clientOrderList.size()); clientOrderList.parallelStream().forEach(p->{