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_web/src/main/java/com/doumee/api/web/NoticeApi.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/NoticeApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/NoticeApi.java
index df5942a..95ce2d2 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/NoticeApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/NoticeApi.java
@@ -9,6 +9,8 @@
 import com.doumee.dao.business.model.Notice;
 import com.doumee.dao.web.dto.NoticeCardDTO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -16,7 +18,7 @@
 @Api(tags = "娑堟伅閫氱煡淇′笟鍔�")
 @Trace(exclude = true)
 @LoginRequired
-//@RestController
+@RestController
 @RequestMapping("/web/notice")
 @Slf4j
 public class NoticeApi extends ApiController{
@@ -27,10 +29,15 @@
      * @param pageWrap
      * @return
      */
-    @ApiOperation(value = "鏌ヨ鐢ㄦ埛閫氱煡", notes = "灏忕▼搴忕")
-    @GetMapping("/findNoticeCardDTOPage")
-    public ApiResponse<PageData<NoticeCardDTO>> findNoticeCardDTOPage(@RequestBody PageWrap<Notice> pageWrap){
 
+    @LoginRequired
+    @ApiOperation(value = "鏌ヨ鐢ㄦ埛閫氱煡", notes = "灏忕▼搴忕")
+    @PostMapping("/findNoticeCardDTOPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
+    public ApiResponse<PageData<NoticeCardDTO>> findNoticeCardDTOPage(@RequestBody PageWrap<Notice> pageWrap){
+        pageWrap.getModel().setMemberId(this.getMemberId());
         return ApiResponse.success(noticeService.findNoticeCardDTOPage(pageWrap));
     }
 
@@ -49,4 +56,18 @@
         return ApiResponse.success(null);
     }
 
+    @LoginRequired
+    @ApiOperation(value = "鐢ㄦ埛鏇存柊闃呰鐘舵��", notes = "灏忕▼搴忕")
+    @GetMapping("/autoRead")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "noticeType", value = "娑堟伅绫诲瀷锛�0=绯荤粺娑堟伅锛�1=绀惧尯娑堟伅", required = true)
+    })
+    public ApiResponse autoRead(@RequestParam Integer noticeType){
+        noticeService.autoRead(getMemberId(),noticeType);
+        return ApiResponse.success(null);
+    }
+
+
+
 }

--
Gitblit v1.9.3