From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java |   75 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 2 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 fa384f9..3954043 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
@@ -2,9 +2,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.api.domain.vo.AppOtherConfigGetVo;
+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.MgtCustomConfigVo;
+import com.ruoyi.system.domain.vo.MgtAllCustomConfigVo;
 import com.ruoyi.system.domain.vo.MgtOperLogPageVo;
 
 import java.util.List;
@@ -38,13 +40,31 @@
     void editServiceMobile( MgtServiceMobileEditDto mgtServiceMobileEditDto);
 
     /**
+     * @description  修改客服二维码
+     * @author  jqs
+     * @date    2023/7/25 16:17
+     * @param mgtServiceCodeEditDto
+     * @return  void
+     */
+    void editServiceCode(MgtServiceCodeEditDto mgtServiceCodeEditDto);
+
+    /**
+     * @description  修改统一分成
+     * @author  jqs
+     * @date    2023/9/4 18:05
+     * @param mgtShopCommonProportionEditDto
+     * @return  void
+     */
+    void editShopProportion(MgtShopCommonProportionEditDto mgtShopCommonProportionEditDto);
+
+    /**
      * @description  平台获取自定义配置
      * @author  jqs
      * @date    2023/6/7 15:02
      * @param
      * @return  MgtCustomConfigVo
      */
-    MgtCustomConfigVo getCustomConfig();
+    MgtAllCustomConfigVo getAllCustomConfig();
 
     /**
      * @description  修改其他设置
@@ -54,6 +74,12 @@
      * @return  void
      */
     void editOtherConfig(MgtOtherConfigEditDto mgtOtherConfigEditDto);
+    
+    /**
+     * 修改门店课程配置
+     * @param mgtStoreCurriculumEditDto
+     */
+    void editStoreCurriculum(MgtStoreCurriculumEditDto mgtStoreCurriculumEditDto);
 
     /**
      * @description  修改合作商配置
@@ -84,5 +110,50 @@
      */
     List<MgtOperLogPageVo> pageOperLog(Page page, MgtOperLogPageDto mgtOperLogPageDto);
 
+    /**
+     * @description  删除日志
+     * @author  jqs
+     * @date    2023/8/1 19:39
+     * @param
+     * @return  void
+     */
+    void deleteOperlog();
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/7/13 15:53
+     * @param
+     * @return  List<String>
+     */
+    List<String> listOperTitle();
+
+    /**
+     * @description  获取单个自定义配置
+     * @author  jqs
+     * @date    2023/6/9 15:40
+     * @param mgtCustomConfigDto
+     * @return  MgtCustomConfigVo
+     */
+    List<String> getCustomConfig(MgtCustomConfigDto mgtCustomConfigDto);
+
+    /**
+    * @description getBulletinBoard
+    * @param
+    * @return MgtBulletinBoardVo
+    * @author jqs34
+    * @date 2023/6/18 16:41
+    */
+    MgtBulletinBoardVo getBulletinBoard();
+
+    /**
+     * @description  获取其他设置
+     * @author  jqs
+     * @date    2023/7/12 15:28
+     * @param
+     * @return  AppOtherConfigGetVo
+     */
+    AppOtherConfigGetVo getAppOtherConfigGetVo();
+
 
 }

--
Gitblit v1.7.1