From 8fd09daba5c89106b4a9aacd8d5ef9354afc93be Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
index 2a6d37b..b188c07 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/NoticeServiceImpl.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.NoticeMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
@@ -233,12 +234,11 @@
;
IPage<Notice> noticeIPage = noticeMapper.selectPage(page, queryWrapper);
List<NoticeCardDTO> noticeCardDTOs = new ArrayList<>();
- if (CollectionUtils.isEmpty(noticeIPage.getRecords())){
+ if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(noticeIPage.getRecords())){
noticeCardDTOs = noticeIPage.getRecords().stream().map(s -> {
NoticeCardDTO noticeCardDTO = new NoticeCardDTO();
BeanUtils.copyProperties(s, noticeCardDTO);
return noticeCardDTO;
-
}).collect(Collectors.toList());
}
PageData<NoticeCardDTO> pageData = new PageData<>();
@@ -421,6 +421,19 @@
}
+ @Override
+ public void autoRead(Integer memberId,Integer noticeType){
+ noticeMapper.update(new UpdateWrapper<Notice>().lambda()
+ .set(Notice::getStatus,Constants.ONE)
+ .set(Notice::getEditDate, DateUtil.getCurrDateTime())
+ .eq(Notice::getMemberId,memberId)
+ .ne(Objects.nonNull(noticeType)&&Constants.equalsInteger(noticeType,Constants.ZERO),Notice::getObjType,Constants.TWO)
+ .eq(Objects.nonNull(noticeType)&&Constants.equalsInteger(noticeType,Constants.ONE),Notice::getObjType,Constants.TWO)
+ .eq(Notice::getStatus,Constants.ZERO)
+ );
+ }
+
+
--
Gitblit v1.9.3