From 8984fa09acab05a52c06668cd2d06262c775cc2f Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 28 二月 2025 14:40:35 +0800 Subject: [PATCH] 新增加门店课程配置 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 15 +++++++++++++++ ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppCourseController.java | 24 ++++++++++++++++++------ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteConfigService.java | 9 +++++++++ ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteConfigFallbackFactory.java | 9 ++++++++- 4 files changed, 50 insertions(+), 7 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 06d7049..5d2a084 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 @@ -95,10 +95,17 @@ @Override + public R<String> getStoreCurriculumPassword() { + return R.fail("获取门店课程验证密码失败:" + throwable.getMessage()); + } + + + + @Override public R<List<SysTag>> listSysTag(Integer tagType) { return R.fail("获取标签失败:" + throwable.getMessage()); } - + @Override public R<List<Activeness>> listActiveness() { return R.fail("获取活跃度列表失败:" + throwable.getMessage()); 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 15b925d..74868ff 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 @@ -155,4 +155,13 @@ */ @PostMapping("/config/createFileRecord") public R createFileRecord(@RequestBody FileRecord fileRecord); + + + + /** + * 获取门店课程验证密码 + * @return + */ + @PostMapping("/config/getStoreCurriculumPassword") + public R<String> getStoreCurriculumPassword(); } 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 d624487..681fdda 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 @@ -2,22 +2,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.goods.domain.dto.XiaoeCourseQueryDto; import com.ruoyi.goods.domain.vo.XiaoeCourseChapterVO; import com.ruoyi.goods.domain.vo.XiaoeCourseGroupVO; import com.ruoyi.goods.domain.vo.XiaoeCourseVO; import com.ruoyi.goods.service.biz.XiaoeCourseService; +import com.ruoyi.system.api.service.RemoteConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; @@ -33,6 +30,9 @@ @RequiredArgsConstructor public class AppCourseController { private final XiaoeCourseService xiaoeCourseService; + + private final RemoteConfigService remoteConfigService; + /** * 课程列表 @@ -65,4 +65,16 @@ public R<List<XiaoeCourseGroupVO>> getCourseGroupList() { return R.ok(xiaoeCourseService.getCourseGroupList()); } + + @ApiOperation("门店身份校验") + @PostMapping("/storeIdentityVerification") + public R storeIdentityVerification(@RequestParam("password") String password){ + String data = remoteConfigService.getStoreCurriculumPassword().getData(); + if(StringUtils.isNotEmpty(data)){ + if(password.equals(data)){ + return R.ok(); + } + } + return R.fail("身份校验失败"); + } } 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 7afe3fc..67cc9b8 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 @@ -1,6 +1,8 @@ package com.ruoyi.system.controller.conslole; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.constant.ConfigEnum; import com.ruoyi.system.api.domain.dto.MgtBaseBathDto; import com.ruoyi.system.api.domain.dto.MgtClassNumDto; import com.ruoyi.system.api.domain.dto.MgtUserIdByDept; @@ -9,6 +11,7 @@ import com.ruoyi.system.api.domain.vo.AppOtherConfigGetVo; import com.ruoyi.system.api.domain.vo.MgtSysSimpleUserVo; import com.ruoyi.system.domain.dto.MgtCustomConfigDto; +import com.ruoyi.system.domain.pojo.config.CustomConfig; import com.ruoyi.system.service.config.*; import com.ruoyi.system.service.staff.SysStaffService; import com.ruoyi.system.service.sys.ISysUserService; @@ -251,4 +254,16 @@ fileRecordService.createFileRecord(fileRecord); return R.ok(); } + + + /** + * 获取门店课程验证密码 + * @return + */ + @PostMapping("/getStoreCurriculumPassword") + public R<String> getStoreCurriculumPassword(){ + CustomConfig one = customConfigService.getOne(new QueryWrapper<CustomConfig>().eq("config_type", ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKeyType()) + .eq("config_key", ConfigEnum.STORE_COURSE_DISPLAY_PASSWORD.getKey())); + return R.ok(one.getConfigValue()); + } } -- Gitblit v1.7.1