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

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

@@ -160,13 +160,15 @@ public class NoticeManageImpl implements NoticeManage {
                 ArrayList<String> mailboxs = new ArrayList<>();
                 for (String clientMoniker : client_monikers) {
                     JSONObject client = clientManager.getClientInfoByMoniker(clientMoniker);
-                    client.put("create_time", date);
+                    JSONObject c = new JSONObject();
-                    client.put("notice_id", noticeId);
+                    c.put("create_time", date);
-                    noticePartnerMapper.save(client);
+                    c.put("notice_id", noticeId);
+                    c.put("client_id", client.getIntValue("client_id"));
+                    noticePartnerMapper.save(c);
                     String contact_email = client.getString("contact_email");
                     if (contact_email!=null && !mailboxs.contains(contact_email)){
-                        client.put("mailto",contact_email);
+                        c.put("mailto",contact_email);
-                        mailto.add(client);
+                        mailto.add(c);
                         mailboxs.add(contact_email);
                     }
                 }
@@ -182,6 +184,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);