From 3ab85dd4809dd5532cc5d1e3ae4a9e66d15ea6c9 Mon Sep 17 00:00:00 2001 From: eason Date: Thu, 28 Jun 2018 11:56:20 +0800 Subject: [PATCH 1/2] fix --- .../payment/manage/merchants/core/impls/ClientManagerImpl.java | 2 +- .../payment/manage/tradelog/core/impls/TradeLogServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index ba11193c2..ef0f05125 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -2653,7 +2653,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid JSONObject result = PageListUtils.buildPageListResult(logs); if (query.getPage() == 1) { if (!logs.isEmpty() && logs.size() > 0) { - JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clearing_order")); + JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clear_detail_id")); if (clearingDetail!=null){ JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ 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 73b5b4929..337e2044e 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 @@ -833,7 +833,7 @@ public class TradeLogServiceImpl implements TradeLogService { result.put("analysis", transactionMapper.getClientAmountAnalysis(params)); if (query.getPage() == 1) { if (!logs.isEmpty() && logs.size() > 0) { - JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clearing_order")); + JSONObject clearingDetail = clearingDetailMapper.findByDetailId(logs.get(0).getIntValue("clear_detail_id")); if (clearingDetail!=null){ JSONObject clearingLog = clearingLogMapper.findById(clearingDetail.getIntValue("clearing_id")); if(clearingLog.getBooleanValue("editable")){ From 3d01808106c2f421321eb7ac5d87ce4af834c4e0 Mon Sep 17 00:00:00 2001 From: eason Date: Thu, 28 Jun 2018 13:35:27 +0800 Subject: [PATCH 2/2] fix --- .../payment/manage/notice/core/impls/NoticeManageImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java index 866ed4db9..4b76f34ab 100644 --- a/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java @@ -166,6 +166,9 @@ public class NoticeManageImpl implements NoticeManage { ArrayList mailboxs = new ArrayList<>(); for (String clientMoniker : client_monikers) { JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker); + if(client==null){ + continue; + } JSONObject c = new JSONObject(); c.put("create_time", date); c.put("notice_id", noticeId);