Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/notice/NoticeLogic.java

@@ -349,15 +349,15 @@ public class NoticeLogic {
         List<NoticeRecord> list = new ArrayList<>();
         list.addAll(noticeRecordService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), NoticeRecord::getAdminCompanyId, adminUser.getCompanyWechatId())
-                .eq(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeRecord::getAdminUserId, adminUser.getAdminUserId())
+                .in(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeRecord::getAdminUserId, adminUser.getAdminWebsitIds())
 
                 .between(NoticeRecord::getIssueTime, dateTime, date1)
                 .list());
 
         List<NoticeWebsitRecord> noticeWebsitRecords = noticeWebsitRecordService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), NoticeWebsitRecord::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .eq(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminUserId())
-
+                .in(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminWebsitIds())
+                .eq(NoticeWebsitRecord::getReadFlag,IsYesNoEnum.NO.getKey())
                 .between(NoticeWebsitRecord::getIssueTime, dateTime, date1).list();
 
         if (CollectionUtils.isNotEmpty(noticeWebsitRecords)){

mall-server-api/src/main/java/com/gree/mall/manager/logic/notice/NoticeWebsitLogic.java

@@ -88,6 +88,7 @@ public class NoticeWebsitLogic {
             noticeWebsitRecord.setAdminWebsitName(adminWebsit.getName());
             noticeWebsitRecord.setCompanyWechatId(adminUser.getCompanyWechatId());
             noticeWebsitRecord.setCompanyWechatName(adminUser.getCompanyName());
+            noticeWebsitRecord.setIssueTime(noticeBean.getIssueTime());
 
 
             noticeWebsitRecords.add(noticeWebsitRecord);
@@ -127,7 +128,13 @@ public class NoticeWebsitLogic {
     public void ofOrSend(String id, String status) {
         NoticeWebsit noticeWebsit = noticeWebsitService.getById(id);
         noticeWebsit.setStatus(status);
+        if (status.equals("SEND"))
+            noticeWebsit.setIssueTime(new Date());
         noticeWebsit.updateById();
+
+        noticeWebsitRecordService.lambdaUpdate()
+                .eq(NoticeWebsitRecord::getNoticeWebsitId,id)
+                .set(NoticeWebsitRecord::getIssueTime,new Date()).update();
     }
 
     public IPage<NoticeWebsitRecordVO> listWebsit(Page page, ZfireParamBean zfireParam) {