From 6c99e5fa806c30cfea532535228c01bf1f063cca Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 三月 2025 10:12:41 +0800
Subject: [PATCH] 增加小程序端课程内容过滤，只展示 健康评估：20275808 中医手法小妙招：20275805 女性呵护：20275707 饮食/运动：20249173 节气小贴士：2406002
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/biz/XiaoeCourseService.java | 24 +++++++++++++++++++++---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerCourseController.java | 4 ++--
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppCourseController.java | 4 ++--
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/XiaoeCourseQueryDto.java | 2 +-
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerCourseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerCourseController.java
index 931550f..ba31001 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerCourseController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerCourseController.java
@@ -42,7 +42,7 @@
@ApiOperation("课程列表")
@PostMapping("/page")
public R<Page<XiaoeCourseVO>> page(@Valid @RequestBody XiaoeCourseQueryDto dto) {
- return R.ok(xiaoeCourseService.getCoursePageList(dto));
+ return R.ok(xiaoeCourseService.getCoursePageList(dto,0));
}
/**
@@ -63,6 +63,6 @@
@ApiOperation("获取课程分组列表")
@GetMapping("/group")
public R<List<XiaoeCourseGroupVO>> getCourseGroupList() {
- return R.ok(xiaoeCourseService.getCourseGroupList());
+ return R.ok(xiaoeCourseService.getCourseGroupList(0));
}
}
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 d5bcfbf..5411181 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
@@ -42,7 +42,7 @@
@ApiOperation("课程列表")
@PostMapping("/page")
public R<Page<XiaoeCourseVO>> page(@Valid @RequestBody XiaoeCourseQueryDto dto) {
- return R.ok(xiaoeCourseService.getCoursePageList(dto));
+ return R.ok(xiaoeCourseService.getCoursePageList(dto,1));
}
/**
@@ -63,7 +63,7 @@
@ApiOperation("获取课程分组列表")
@GetMapping("/group")
public R<List<XiaoeCourseGroupVO>> getCourseGroupList() {
- return R.ok(xiaoeCourseService.getCourseGroupList());
+ return R.ok(xiaoeCourseService.getCourseGroupList(1));
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/XiaoeCourseQueryDto.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/XiaoeCourseQueryDto.java
index ccb16f3..1ba7e06 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/XiaoeCourseQueryDto.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/XiaoeCourseQueryDto.java
@@ -26,7 +26,7 @@
@ApiModelProperty("课程分组id数组")
@JSONField(name = "tags")
- private List<Integer> tags;
+ private List<String> tags;
@ApiModelProperty(value = "当前页")
@JSONField(name = "page_index")
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/biz/XiaoeCourseService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/biz/XiaoeCourseService.java
index 87b8e5b..617ebef 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/biz/XiaoeCourseService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/biz/XiaoeCourseService.java
@@ -1,5 +1,6 @@
package com.ruoyi.goods.service.biz;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.goods.domain.dto.XiaoeCourseQueryDto;
import com.ruoyi.goods.domain.vo.XiaoeCourseChapterVO;
@@ -9,7 +10,13 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* @author mitao
@@ -23,9 +30,13 @@
/**
* 课程列表
* @param dto
+ * @param appletFlag 是否小程序端 1：是 0：否
* @return
*/
- public Page<XiaoeCourseVO> getCoursePageList(XiaoeCourseQueryDto dto) {
+ public Page<XiaoeCourseVO> getCoursePageList(XiaoeCourseQueryDto dto, Integer appletFlag) {
+ if (1 == appletFlag && CollUtil.isEmpty(dto.getTags())) {
+ dto.setTags(Arrays.asList("20275808", "20275805", "20275707", "20249173", "2406002"));
+ }
return xiaoeUtils.getCoursePageList(dto);
}
@@ -40,9 +51,16 @@
/**
* 获取课程分组列表
+ * @Param appletFlag 是否为小程序端 1：是 0：否
* @return
*/
- public List<XiaoeCourseGroupVO> getCourseGroupList() {
- return xiaoeUtils.getCourseGroupList();
+ public List<XiaoeCourseGroupVO> getCourseGroupList(Integer appletFlag) {
+ List<XiaoeCourseGroupVO> courseGroupList = Optional.ofNullable(xiaoeUtils.getCourseGroupList()).orElse(Collections.emptyList());
+ if (1 == appletFlag) {
+ //健康评估：20275808 中医手法小妙招：20275805 女性呵护：20275707 饮食/运动：20249173 节气小贴士：2406002
+ Set<String> permissionList = new HashSet<>(Arrays.asList("20275808", "20275805", "20275707", "20249173", "2406002"));
+ courseGroupList = courseGroupList.stream().filter(item -> permissionList.contains(item.getId())).collect(Collectors.toList());
+ }
+ return courseGroupList;
}
}
--
Gitblit v1.7.1