Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

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")){

src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java

@@ -166,6 +166,9 @@ public class NoticeManageImpl implements NoticeManage {
                 ArrayList<String> 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);

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")){