需求

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

@@ -14,10 +14,7 @@ import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.logic.admin.AdminUserLogic;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
-import com.gree.mall.manager.plus.service.AdminUserService;
-import com.gree.mall.manager.plus.service.NoticeRecordService;
-import com.gree.mall.manager.plus.service.NoticeService;
-import com.gree.mall.manager.plus.service.UserService;
+import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import org.springframework.beans.BeanUtils;
@@ -50,6 +47,12 @@ public class NoticeLogic {
     @Autowired
     UserService userService;
 
+    @Autowired
+    NoticeWebsitRecordService noticeWebsitRecordService;
+
+    @Autowired
+    NoticeWebsitService noticeWebsitService;
+
 
 
 
@@ -343,12 +346,33 @@ public class NoticeLogic {
 
         Date date1 = new Date();
 
-        List<NoticeRecord> list = noticeRecordService.lambdaQuery()
+        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())
-                //.ne( NoticeRecord::getAdminNoticeType, "NOTICE")
+
                 .between(NoticeRecord::getIssueTime, dateTime, date1)
-                .list();
+                .list());
+
+        List<NoticeWebsitRecord> noticeWebsitRecords = noticeWebsitRecordService.lambdaQuery()
+                .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), NoticeWebsitRecord::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(!StringUtil.isEmpty(adminUser.getAdminUserId()), NoticeWebsitRecord::getAdminWebsitId, adminUser.getAdminUserId())
+
+                .between(NoticeWebsitRecord::getIssueTime, dateTime, date1).list();
+
+        if (CollectionUtils.isNotEmpty(noticeWebsitRecords)){
+            List<NoticeWebsit> noticeWebsits = noticeWebsitService.lambdaQuery().in(NoticeWebsit::getNoticeWebsitId,
+                    noticeWebsitRecords.stream().map(NoticeWebsitRecord::getNoticeWebsitId).collect(Collectors.toList()))
+                    .list();
+
+            for (NoticeWebsit noticeWebsit : noticeWebsits) {
+                NoticeRecord noticeRecord = new NoticeRecord();
+                noticeRecord.setNoticeType(noticeWebsit.getType());
+                noticeRecord.setTitle(noticeWebsit.getTitle());
+                list.add(noticeRecord);
+            }
+        }
+
 
         return list;
     }