From 4b9587bae559732c5ef485043f2ed4dcdc27ac9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Sat, 12 Apr 2025 10:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=B8=AD=E5=BF=83=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/controller/admin/SyncNoticeController.java    | 2 +-
 .../src/main/java/com/czg/product/dto/SyncNoticeReadDTO.java   | 1 -
 .../service/account/service/impl/SyncNoticeServiceImpl.java    | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/SyncNoticeController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/SyncNoticeController.java
index 53475984..ff13ad29 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/SyncNoticeController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/SyncNoticeController.java
@@ -50,7 +50,7 @@ public class SyncNoticeController {
 
 
     /**
-     * 已读消息
+     * 已读消息, 不传递已读所有
      * @return 是否成功
      */
     @PutMapping("/read")
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/SyncNoticeReadDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/SyncNoticeReadDTO.java
index 89838a2a..481b2b17 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/SyncNoticeReadDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/SyncNoticeReadDTO.java
@@ -13,6 +13,5 @@ public class SyncNoticeReadDTO {
     /**
      * 消息id
      */
-    @NotEmpty
     private List<Long> noticeIdList;
 }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SyncNoticeServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SyncNoticeServiceImpl.java
index f323c7ae..8c52b1a1 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SyncNoticeServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SyncNoticeServiceImpl.java
@@ -83,6 +83,9 @@ public class SyncNoticeServiceImpl extends ServiceImpl<SyncNoticeMapper, SyncNot
 
     @Override
     public Boolean read(Long shopId, SyncNoticeReadDTO syncNoticeReadDTO) {
+        if (syncNoticeReadDTO.getNoticeIdList() == null || syncNoticeReadDTO.getNoticeIdList().isEmpty()) {
+            return updateChain().eq(SyncNotice::getShopId, shopId).set(SyncNotice::getIsRead, 1).set(SyncNotice::getReadTime, DateUtil.date().toLocalDateTime()).update();
+        }
         List<SyncNotice> listed = list(new QueryWrapper().eq(SyncNotice::getShopId, shopId).in(SyncNotice::getId, syncNoticeReadDTO.getNoticeIdList()));
         listed.forEach(item -> {
             if (item.getIsRead() == 0) {