From 21b0a71347f6fb986c7c3b9273eba47fb31c8a41 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 28 二月 2025 17:35:14 +0800 Subject: [PATCH] 新增加门店课程配置 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 12 ++++++ ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppCourseController.java | 10 +++++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java | 9 ++++ ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStoreCurriculumEditDto.java | 27 +++++++++++++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java | 6 ++- 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java index 5d2a084..21c63b0 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java @@ -98,8 +98,10 @@ public R<String> getStoreCurriculumPassword() { return R.fail("获取门店课程验证密码失败:" + throwable.getMessage()); } - - + @Override + public R<String> getStoreCurriculumName() { + return R.fail("获取门店课程展示名称失败:" + throwable.getMessage()); + } @Override public R<List<SysTag>> listSysTag(Integer tagType) { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java index 74868ff..83a62b2 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java @@ -164,4 +164,13 @@ */ @PostMapping("/config/getStoreCurriculumPassword") public R<String> getStoreCurriculumPassword(); + + + + /** + * 获取门店课程展示名称 + * @return + */ + @PostMapping("/config/getStoreCurriculumName") + public R<String> getStoreCurriculumName(); } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppCourseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppCourseController.java index 681fdda..d5bcfbf 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppCourseController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppCourseController.java @@ -66,6 +66,8 @@ return R.ok(xiaoeCourseService.getCourseGroupList()); } + + @ApiOperation("门店身份校验") @PostMapping("/storeIdentityVerification") public R storeIdentityVerification(@RequestParam("password") String password){ @@ -77,4 +79,12 @@ } return R.fail("身份校验失败"); } + + + @ApiOperation("门店身份校验展示名称") + @PostMapping("/getStoreCurriculumName") + public R getStoreCurriculumName(){ + String data = remoteConfigService.getStoreCurriculumName().getData(); + return R.ok(data); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java index 67cc9b8..805eed6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java @@ -266,4 +266,16 @@ .eq("config_key", ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKey())); return R.ok(one.getConfigValue()); } + + + /** + * 获取门店课程展示名称 + * @return + */ + @PostMapping("/getStoreCurriculumName") + public R<String> getStoreCurriculumName(){ + CustomConfig one = customConfigService.getOne(new QueryWrapper<CustomConfig>().eq("config_type", ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKeyType()) + .eq("config_key", ConfigEnum.STORE_COURSE_DISPLAY_NAME.getKey())); + return R.ok(one.getConfigValue()); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStoreCurriculumEditDto.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStoreCurriculumEditDto.java new file mode 100644 index 0000000..2045805 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtStoreCurriculumEditDto.java @@ -0,0 +1,27 @@ +package com.ruoyi.system.domain.dto; + +import com.ruoyi.system.api.domain.dto.MgtBaseDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @ClassName MgtActivenessEditDto + * @Description TODO + * @Author jqs + * @Date 2023/6/7 17:40 + * @Version 1.0 + */ +@Data +public class MgtStoreCurriculumEditDto extends MgtBaseDto { + + @ApiModelProperty(value = "门店课程设置-展示名称") + @NotNull(message = "门店课程设置-展示名称不能为空") + private String storeCourseDisplayName; + + @ApiModelProperty(value = "门店课程设置-验证密码") + @NotNull(message = "门店课程设置-验证密码不能为空") + private String storeCourseDisplayPassword; + +} -- Gitblit v1.7.1