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/ClientInfoCacheSupportImpl.java

@@ -30,7 +30,9 @@ public class ClientInfoCacheSupportImpl implements ClientInfoCacheSupport{
             signInAccountService.clearAccountCache(acc.getString("account_id"));
         }
         JSONObject client = clientManager.getClientInfo(clientId);
-        clientInfoCacheSupport.clearClientMonikerCache(client.getString("client_moniker"));
+        if(client!=null){
+            clientInfoCacheSupport.clearClientMonikerCache(client.getString("client_moniker"));
+        }
     }
 
     @Override

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

@@ -182,6 +182,7 @@ public class NoticeManageImpl implements NoticeManage {
                         }
                     }
                     try {
+                        logger.info(noticeId+"|"+info.getTitle()+"|"+mailto);
                         String mail_id = mailService.sendEmail(noticeId,info.getTitle(),mailto,info.getContent());
                         notice.put("mail_id",mail_id);
                         noticeManageMapper.updateNotice(notice);