From 60ca657f893187fa44a24b991ce2a7c235bb9a38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 10 Apr 2025 11:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=90=8C=E6=AD=A5=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 | 6 +++---
 .../src/main/java/com/czg/account/entity/SyncNotice.java    | 4 ----
 .../java/com/czg/account/service/SyncNoticeService.java     | 2 +-
 .../service/account/service/impl/SyncNoticeServiceImpl.java | 5 ++---
 4 files changed, 6 insertions(+), 11 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 f96eba3fa..534759847 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
@@ -27,15 +27,15 @@ public class SyncNoticeController {
      * @param name 名称
      * @param startTime 起始时间
      * @param endTime 结束时间
-     * @param type  0 商品新增 1 商品编辑 2 耗材新增 3 耗材编辑
+     * @param title  数据同步/数据变动/库存预警
      * @param isRead 0-未读 1-已读
      * @return 分页数据
      */
     @GetMapping
     public CzgResult<Page<SyncNotice>> page(@RequestParam(required = false) String name, @RequestParam(required = false) String startTime,
-                                            @RequestParam(required = false) String endTime, @RequestParam(required = false) Integer type,
+                                            @RequestParam(required = false) String endTime, @RequestParam(required = false) String title,
                                             @RequestParam(required = false) Integer isRead) {
-        return CzgResult.success(syncNoticeService.pageInfo(StpKit.USER.getShopId(), name, startTime, endTime, type, isRead));
+        return CzgResult.success(syncNoticeService.pageInfo(StpKit.USER.getShopId(), name, startTime, endTime, title, isRead));
     }
 
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SyncNotice.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SyncNotice.java
index b770841d0..3609cb97c 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SyncNotice.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/SyncNotice.java
@@ -38,10 +38,6 @@ public class SyncNotice implements Serializable {
      */
     private Long sysUserId;
 
-    /**
-     * 通知类型 0 商品新增 1 商品编辑 2耗材新增 3耗材编辑
-     */
-    private Integer type;
 
     /**
      * 是否已读，1已读
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SyncNoticeService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SyncNoticeService.java
index 37900bcba..d42ab8f02 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SyncNoticeService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SyncNoticeService.java
@@ -49,7 +49,7 @@ public interface SyncNoticeService extends IService<SyncNotice> {
      */
     void addNotice(Long shopId, Long sysUserId, String title, String content, String extraJson);
 
-    Page<SyncNotice> pageInfo(Long shopId, String name, String startTime, String endTime, Integer type, Integer isRead);
+    Page<SyncNotice> pageInfo(Long shopId, String name, String startTime, String endTime, String title, Integer isRead);
 
     Boolean read(Long shopId, SyncNoticeReadDTO syncNoticeReadDTO);
 
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 82fe9e9a3..f323c7ae9 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
@@ -29,7 +29,6 @@ public class SyncNoticeServiceImpl extends ServiceImpl<SyncNoticeMapper, SyncNot
         SyncNotice syncNotice = new SyncNotice();
         syncNotice.setShopId(shopId);
         syncNotice.setSysUserId(sysUserId);
-        syncNotice.setType(type);
         String content = switch (type) {
             case 0 -> "新增商品";
             case 1 -> "修改商品";
@@ -63,7 +62,7 @@ public class SyncNoticeServiceImpl extends ServiceImpl<SyncNoticeMapper, SyncNot
 
 
     @Override
-    public Page<SyncNotice> pageInfo(Long shopId, String name, String startTime, String endTime, Integer type, Integer isRead) {
+    public Page<SyncNotice> pageInfo(Long shopId, String name, String startTime, String endTime, String title, Integer isRead) {
         QueryWrapper queryWrapper = new QueryWrapper().eq(SyncNotice::getShopId, shopId);
         if (StrUtil.isNotBlank(name)) {
             queryWrapper.like(SyncNotice::getContent, name);
@@ -76,7 +75,7 @@ public class SyncNoticeServiceImpl extends ServiceImpl<SyncNoticeMapper, SyncNot
         if (StrUtil.isNotBlank(endTime)) {
             queryWrapper.le(SyncNotice::getCreateTime, endTime);
         }
-        queryWrapper.eq(SyncNotice::getType, type);
+        queryWrapper.eq(SyncNotice::getTitle, title);
         queryWrapper.eq(SyncNotice::getIsRead, isRead);
         queryWrapper.orderBy(SyncNotice::getCreateTime, false);
         return page(PageUtil.buildPage(), queryWrapper);