From 927fab3bdd8efe99bf4b623150f9499ad8228462 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Fri, 8 Aug 2025 19:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsome=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promotion/controller/course/CourseController.java  |  1 +
 .../controller/course/CourseOrderController.java       | 10 ++++++----
 src/main/resources/application.yml                     |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/greenorange/promotion/controller/course/CourseController.java b/src/main/java/com/greenorange/promotion/controller/course/CourseController.java
index d552981..432f914 100644
--- a/src/main/java/com/greenorange/promotion/controller/course/CourseController.java
+++ b/src/main/java/com/greenorange/promotion/controller/course/CourseController.java
@@ -109,6 +109,7 @@ public class CourseController {
     public BaseResponse<List<CourseCardVO>> miniQueryCourseByKeyword(@Valid @RequestBody CommonStringRequest commonStringRequest) {
         String keyword = commonStringRequest.getTemplateString();
         LambdaQueryWrapper<Course> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Course::getIsShelves, true);
         lambdaQueryWrapper.like(Course::getName, keyword);
         List<Course> courseList = courseService.list(lambdaQueryWrapper);
         List<CourseCardVO> courseCardVOS = commonService.convertList(courseList, CourseCardVO.class);
diff --git a/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java b/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java
index fb63b00..814d1db 100644
--- a/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java
+++ b/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java
@@ -18,11 +18,9 @@ import com.greenorange.promotion.model.dto.CommonRequest;
 import com.greenorange.promotion.model.dto.courseOrder.CourseOrderAddRequest;
 import com.greenorange.promotion.model.dto.courseOrder.CourseOrderQueryRequest;
 import com.greenorange.promotion.model.dto.courseOrder.CourseOrderUpdateRequest;
-import com.greenorange.promotion.model.entity.Course;
-import com.greenorange.promotion.model.entity.CourseOrder;
-import com.greenorange.promotion.model.entity.CoursePromotionCommissionPending;
-import com.greenorange.promotion.model.entity.UserPerformanceSummary;
+import com.greenorange.promotion.model.entity.*;
 import com.greenorange.promotion.model.enums.CommissionStatusEnum;
+import com.greenorange.promotion.model.enums.UserRoleEnum;
 import com.greenorange.promotion.model.vo.course.CourseCardVO;
 import com.greenorange.promotion.model.vo.course.CourseVO;
 import com.greenorange.promotion.model.vo.courseOrder.CourseOrderBaseInfoVO;
@@ -93,6 +91,10 @@ public class CourseOrderController {
     @SysLog(title = "课程订单管理", content = "小程序端用户生成课程订单")
     public BaseResponse<Long> addCourseOrder(@Valid @RequestBody CourseOrderAddRequest courseOrderAddRequest, HttpServletRequest request) {
         Long userId = (Long) request.getAttribute("userId");
+        UserInfo userInfo = userInfoService.getById(userId);
+        String userRole = userInfo.getUserRole();
+        UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole);
+        ThrowUtils.throwIf(!UserRoleEnum.USER.equals(userRoleEnum), ErrorCode.NO_AUTH_ERROR, "只有普通用户才能创建订单");
         Long courseId = courseOrderAddRequest.getCourseId();
         Course course = courseService.getById(courseId);
         ThrowUtils.throwIf(course == null, ErrorCode.OPERATION_ERROR, "该课程不存在");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a17ec4c..3a0f5e6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
+    active: caozhe