From 9c442f2dacd50ac9e601212582eb17a9627840f2 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Thu, 19 Jun 2025 10:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=9C=9F=E8=AF=BE=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taihumed/controller/CourseController.java | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java b/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java
index 1fbf9f2b..285146b6 100644
--- a/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java
+++ b/src/main/java/com/peanut/modules/taihumed/controller/CourseController.java
@@ -156,6 +156,37 @@ public class CourseController {
         return R.ok().put("pageRes",pageRes);
     }
 
+    //我的课程-过期课程
+    @RequestMapping("/getCourseExpire")
+    public R getCourseExpire(){
+        List courseEntities = new ArrayList();
+        MPJLambdaWrapper<CourseEntity> wrapper = new MPJLambdaWrapper<>();
+        wrapper.distinct();
+        wrapper.leftJoin(CourseCatalogueEntity.class,CourseCatalogueEntity::getCourseId,CourseEntity::getId);
+        //关掉本次查询del_flg = 0的条件，查询过期课程
+        wrapper.disableSubLogicDel().rightJoin(UserCourseBuyEntity.class,UserCourseBuyEntity::getCatalogueId,CourseCatalogueEntity::getId);
+        wrapper.rightJoin(CourseToTaihumed.class,CourseToTaihumed::getCourseId,CourseEntity::getId);
+        wrapper.eq(UserCourseBuyEntity::getUserId,ShiroUtils.getUId());
+        wrapper.eq(UserCourseBuyEntity::getDelFlag,-1);
+        wrapper.selectAll(CourseEntity.class);
+        wrapper.selectAs(CourseCatalogueEntity::getId,"catalogueId");
+        wrapper.selectAs(CourseCatalogueEntity::getTitle,"catalogueTitle");
+        wrapper.orderByAsc(CourseEntity::getSort);
+        wrapper.orderByAsc(CourseCatalogueEntity::getSort);
+        List<Map<String,Object>> list = courseService.listMaps(wrapper);
+        for (Map<String,Object> courseEntity : list) {
+            int ucb = userCourseBuyService.count(new LambdaQueryWrapper<UserCourseBuyEntity>()
+                    .eq(UserCourseBuyEntity::getUserId,ShiroUtils.getUId())
+                    .eq(UserCourseBuyEntity::getCatalogueId,courseEntity.get("catalogueId")));
+            if (ucb == 0) {
+                courseEntities.add(courseEntity);
+            }
+        }
+        return R.ok().put("courseList",courseEntities);
+    }
+
+
+
     public void topLael(List<Integer> list, int courseTaihumedId){
         CourseTaihumed courseTaihumed = courseTaihumedService.getById(courseTaihumedId);
         if (courseTaihumed.getPid()==0){