merge confilct

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

@@ -10,6 +10,7 @@ import au.com.royalpay.payment.manage.notice.beans.NoticeInfo;
 import au.com.royalpay.payment.manage.notice.beans.NoticeQuery;
 import au.com.royalpay.payment.manage.notice.core.MailService;
 import au.com.royalpay.payment.manage.notice.core.NoticeManage;
+import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.utils.PageListUtils;
 
 import com.alibaba.fastjson.JSONObject;
@@ -206,5 +207,14 @@ public class NoticeManageImpl implements NoticeManage {
         return noticeManageMapper.getLatestWindowNotice(client_id,new Date());
     }
 
+    @Override
+    public void toggleNoticeAppWindow(String noticeId, Boolean isAppWindow) {
+        JSONObject notice = noticeManageMapper.getNoticeDetailById(noticeId);
+        if (notice.getDate("end_time")!=null && notice.getDate("end_time").compareTo(new Date())<0){
+            throw new ForbiddenException("The Notice has expired");
+        }
+        notice.put("is_app_window",isAppWindow);
+        noticeManageMapper.updateNotice(notice);
+    }
 
 }