From 16face1a901a018eee1122f27745eff8d5a6ea98 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 二月 2025 14:30:03 +0800
Subject: [PATCH] 新增加门店课程配置
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java | 2 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 10 +++++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java | 6 +++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java | 7 +++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java | 6 ++-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/ConfigEnum.java | 4 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java | 43 +++++++++++++++++++++
7 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/ConfigEnum.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/ConfigEnum.java
index ff5a58a..952bbe7 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/ConfigEnum.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/ConfigEnum.java
@@ -38,7 +38,9 @@
HOME_STYLE("HOME_STYLE", 2,"首页风格"),
HOME_SLOGAN("HOME_SLOGAN", 1,"首页广告语"),
HOME_LOGO("HOME_LOGO", 1,"首页logo"),
- SHOP_COMMON_PROPORTION("SHOP_COMMON_PROPORTION", 3,"商户统一分成");
+ SHOP_COMMON_PROPORTION("SHOP_COMMON_PROPORTION", 3,"商户统一分成"),
+ STORE_COURSE_DISPLAY_NAME("STORE_COURSE_DISPLAY_NAME", 2,"门店课程设置-展示名称"),
+ STORE_COURSE_DISPLAY_PASSWORD("STORE_COURSE_DISPLAY_PASSWORD", 2,"门店课程设置-验证密码");
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
index 7b1dc21..01fa855 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
@@ -290,6 +290,16 @@
customConfigService.editOtherConfig(mgtOtherConfigEditDto);
return R.ok();
}
+
+
+ @RequestMapping(value = "/editStoreCurriculum", method = RequestMethod.POST)
+ @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改门店课程设置")
+ @ApiOperation(value = "修改门店课程设置")
+ public R editStoreCurriculum(@Validated @RequestBody MgtStoreCurriculumEditDto mgtStoreCurriculumEditDto) {
+ customConfigService.editStoreCurriculum(mgtStoreCurriculumEditDto);
+ return R.ok();
+ }
+
@RequestMapping(value = "/editShopConfig", method = RequestMethod.POST)
@Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改合作商配置")
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java
index cb1e865..811ccc0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtAllCustomConfigVo.java
@@ -92,4 +92,11 @@
@ApiModelProperty(value = "活跃度list")
private List<MgtActivenessVo> mgtActivenessVoList;
+
+ @ApiModelProperty(value = "门店课程设置-展示名称")
+ private String storeCourseDisplayName;
+
+ @ApiModelProperty(value = "门店课程设置-验证密码")
+ private String storeCourseDisplayPassword;
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java
index f0840e4..56f0cf4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/ActivenessService.java
@@ -4,7 +4,9 @@
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.poji.config.Activeness;
import com.ruoyi.system.domain.dto.MgtActivenessEditDto;
+import com.ruoyi.system.domain.dto.MgtStoreCurriculumEditDto;
import com.ruoyi.system.domain.vo.MgtActivenessListVo;
+import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
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 6a0688d..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
@@ -74,6 +74,12 @@
* @return void
*/
void editOtherConfig(MgtOtherConfigEditDto mgtOtherConfigEditDto);
+
+ /**
+ * 修改门店课程配置
+ * @param mgtStoreCurriculumEditDto
+ */
+ void editStoreCurriculum(MgtStoreCurriculumEditDto mgtStoreCurriculumEditDto);
/**
* @description 修改合作商配置
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
index e8554cb..c4dbc4b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/ActivenessServiceImpl.java
@@ -5,7 +5,7 @@
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.poji.config.Activeness;
import com.ruoyi.system.domain.dto.MgtActivenessEditDto;
-import com.ruoyi.system.domain.vo.MgtActivenessListVo;
+import com.ruoyi.system.domain.dto.MgtStoreCurriculumEditDto;import com.ruoyi.system.domain.vo.MgtActivenessListVo;
import com.ruoyi.system.mapper.config.ActivenessMapper;
import com.ruoyi.system.service.config.ActivenessService;
import org.springframework.stereotype.Service;
@@ -65,7 +65,9 @@
activeness.setEndDay(mgtActivenessEditDto.getEndDay());
this.saveOrUpdate(activeness);
}
-
+
+
+
/**
* @description 删除活跃度
* @author jqs
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
index 447142e..6ddda72 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java
@@ -2,8 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ibm.icu.util.LocaleData;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
@@ -244,6 +246,12 @@
case "NURSE_PROBLEM":
mgtAllCustomConfigVo.setNurseProblem(value.getConfigValue());
break;
+ case "STORE_COURSE_DISPLAY_NAME":
+ mgtAllCustomConfigVo.setStoreCourseDisplayName(value.getConfigValue());
+ break;
+ case "STORE_COURSE_DISPLAY_PASSWORD":
+ mgtAllCustomConfigVo.setStoreCourseDisplayPassword(value.getConfigValue());
+ break;
default:
break;
}
@@ -296,6 +304,41 @@
// 新建配置
createNewConfig(mgtOtherConfigEditDto, updateTime);
}
+
+
+ /**
+ * 修改门店课程配置
+ * @param mgtStoreCurriculumEditDto
+ */
+ @Override
+ public void editStoreCurriculum(MgtStoreCurriculumEditDto mgtStoreCurriculumEditDto) {
+ customConfigMapper.delete(new QueryWrapper<CustomConfig>().eq("config_type", ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKeyType())
+ .eq("config_key", ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKey()));
+ customConfigMapper.delete(new QueryWrapper<CustomConfig>().eq("config_type", ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKeyType())
+ .eq("config_key", ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKey()));
+
+ CustomConfig customConfig = new CustomConfig();
+ customConfig.setDelFlag(0);
+ customConfig.setConfigType(2);
+ customConfig.setConfigKey(ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKey());
+ customConfig.setConfigName(ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKeyName());
+ customConfig.setCreateTime(new Date());
+ customConfig.setUpdateTime(new Date());
+ customConfig.setConfigValue(mgtStoreCurriculumEditDto.getStoreCourseDisplayName());
+ this.saveOrUpdate(customConfig);
+
+ customConfig = new CustomConfig();
+ customConfig.setDelFlag(0);
+ customConfig.setConfigType(2);
+ customConfig.setConfigKey(ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKey());
+ customConfig.setConfigName(ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKeyName());
+ customConfig.setCreateTime(new Date());
+ customConfig.setUpdateTime(new Date());
+ customConfig.setConfigValue(mgtStoreCurriculumEditDto.getStoreCourseDisplayPassword());
+ this.saveOrUpdate(customConfig);
+ }
+
+
/**
* @param updateTime
--
Gitblit v1.7.1