From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java |   62 ++++++++++++++++++++++++++++++-
 1 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java
index b7aa76d..e355818 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java
@@ -3,8 +3,13 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.shop.domain.dto.MerShopSuggestDto;
+import com.ruoyi.shop.domain.dto.MgtReplayShopSuggestDto;
+import com.ruoyi.shop.domain.dto.MgtShopSuggestPageDto;
+import com.ruoyi.shop.domain.dto.MgtTagShopSuggestDto;
 import com.ruoyi.shop.domain.pojo.shop.ShopSuggest;
 import com.ruoyi.shop.domain.vo.MerShopSuggestVo;
+import com.ruoyi.shop.domain.vo.MgtShopSuggestPageVo;
+import com.ruoyi.shop.domain.vo.MgtShopSuggestTagVo;
 import com.ruoyi.system.api.domain.dto.MerPageDto;
 
 import java.util.List;
@@ -33,6 +38,59 @@
      */
     void suggest(MerShopSuggestDto merShopSuggestDto);
 
-    
-    void deleteShopSuggestTag( String tag);
+    /**
+     * @description  删除商户建议标签
+     * @author  jqs
+     * @date    2023/6/9 10:18
+     * @param suggestTag
+     * @return  void
+     */
+    void deleteShopSuggestTag(String suggestTag);
+
+    /**
+    * @description 平台获取商户建议列表
+    * @param page
+    * @param mgtShopSuggestPageDto
+    * @return List<MgtShopSuggestPageVo>
+    * @author jqs34
+    * @date 2023/6/11 16:56
+    */
+    List<MgtShopSuggestPageVo> pageMgtShopSuggest (Page page, MgtShopSuggestPageDto mgtShopSuggestPageDto);
+
+    /**
+    * @description 平台回复会员建议
+    * @param mgtReplayShopSuggestDto
+    * @return void
+    * @author jqs34
+    * @date 2023/6/11 17:09
+    */
+    void mgtReplayShopSuggest(MgtReplayShopSuggestDto mgtReplayShopSuggestDto);
+
+    /**
+    * @description 获取商户建议标签
+    * @param suggestId
+    * @return List<MgtShopSuggestTagVo>
+    * @author jqs34
+    * @date 2023/6/11 17:31
+    */
+    List<MgtShopSuggestTagVo> listMgtShopSuggestTag(Long suggestId);
+
+    /**
+    * @description 平台编辑会员建议标签
+    * @param mgtTagShopSuggestDto
+    * @return void
+    * @author jqs34
+    * @date 2023/6/11 17:34
+    */
+    void mgtEditShopSuggestTag(MgtTagShopSuggestDto mgtTagShopSuggestDto);
+
+
+    /**
+     * @description  获取会员未回复建议数量
+     * @author  jqs
+     * @date    2023/7/5 12:46
+     * @param
+     * @return  Integer
+     */
+    Integer getUnReplaySuggestVo();
 }

--
Gitblit v1.7.1