From b4882b114f082e010d4cc3359d78d18095ef3b83 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 26 六月 2023 19:49:38 +0800
Subject: [PATCH] 商户端和管理台联调bug

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java
index d87f9a1..9e2814b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java
@@ -1,12 +1,15 @@
 package com.ruoyi.system.service.config;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.system.domain.dto.MgtMemberConfigEditDto;
-import com.ruoyi.system.domain.dto.MgtOtherConfigEditDto;
-import com.ruoyi.system.domain.dto.MgtServiceMobileEditDto;
-import com.ruoyi.system.domain.dto.MgtShopConfigEditDto;
+import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
+import com.ruoyi.system.domain.dto.*;
 import com.ruoyi.system.domain.pojo.config.CustomConfig;
+import com.ruoyi.system.domain.vo.MgtAllCustomConfigVo;
 import com.ruoyi.system.domain.vo.MgtCustomConfigVo;
+import com.ruoyi.system.domain.vo.MgtOperLogPageVo;
+
+import java.util.List;
 
 /**
  * @ClassName CustomConfigService
@@ -43,7 +46,7 @@
      * @param
      * @return  MgtCustomConfigVo
      */
-    MgtCustomConfigVo getCustomConfig();
+    MgtAllCustomConfigVo getAllCustomConfig();
 
     /**
      * @description  修改其他设置
@@ -71,4 +74,34 @@
      * @return  void
      */
     void editMemberConfig(MgtMemberConfigEditDto mgtMemberConfigEditDto);
+
+
+    /**
+     * @description  分页获取操作日志
+     * @author  jqs
+     * @date    2023/6/8 11:52
+     * @param page
+     * @param mgtOperLogPageDto
+     * @return  List<MgtOperLogPageVo>
+     */
+    List<MgtOperLogPageVo> pageOperLog(Page page, MgtOperLogPageDto mgtOperLogPageDto);
+
+    /**
+     * @description  获取单个自定义配置
+     * @author  jqs
+     * @date    2023/6/9 15:40
+     * @param mgtCustomConfigDto
+     * @return  MgtCustomConfigVo
+     */
+    MgtCustomConfigVo getCustomConfig(MgtCustomConfigDto mgtCustomConfigDto);
+
+    /**
+    * @description getBulletinBoard
+    * @param
+    * @return MgtBulletinBoardVo
+    * @author jqs34
+    * @date 2023/6/18 16:41
+    */
+    MgtBulletinBoardVo getBulletinBoard();
+
 }

--
Gitblit v1.7.1