From dc17da6c7e56ef705046d0c4aeaa0166a39eb6ba Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Fri, 27 Sep 2024 14:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=A6=E5=91=98=E6=AF=8F?=
 =?UTF-8?q?=E9=97=A8=E8=AF=BE=E6=98=AF=E5=90=A6=E8=B4=AD=E4=B9=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ClassEntityServiceImpl.java  | 22 +++++++++++--------
 .../modules/mq/Consumer/CommonConsumer.java   | 22 ++++++++++++-------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
index 223d4cd0..aa4afce3 100644
--- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
+++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
@@ -711,15 +711,19 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             List<ClassCourse> courses = classCourseDao.selectList(new LambdaQueryWrapper<ClassCourse>()
                     .eq(ClassCourse::getModelId,classEntity.getModelId()));
             for (ClassCourse classCourse:courses){
-                List<UserCourseBuyEntity> ucb = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>()
-                        .eq(UserCourseBuyEntity::getUserId,user.getId())
-                        .eq(UserCourseBuyEntity::getCourseId,classCourse.getCourseId()));
-                if (ucb.size() == 0){
-                    CourseEntity courseEntity = courseDao.selectById(classCourse.getCourseId());
-                    if (StringUtils.isEmpty(msg)){
-                        msg+=courseEntity.getTitle()+"";
-                    }else {
-                        msg+=","+courseEntity.getTitle();
+                List<CourseCatalogueEntity> catalogues = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>()
+                        .eq(CourseCatalogueEntity::getCourseId,classCourse.getCourseId()));
+                for (CourseCatalogueEntity catalog:catalogues){
+                    int ucbCount = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
+                            .eq(UserCourseBuyEntity::getUserId,user.getId())
+                            .eq(UserCourseBuyEntity::getCatalogueId,catalog.getId()));
+                    if (ucbCount == 0){
+                        CourseEntity courseEntity = courseDao.selectById(classCourse.getCourseId());
+                        if (StringUtils.isEmpty(msg)){
+                            msg+=courseEntity.getTitle()+"-"+catalog.getTitle();
+                        }else {
+                            msg+=","+courseEntity.getTitle()+"-"+catalog.getTitle();
+                        }
                     }
                 }
             }
diff --git a/src/main/java/com/peanut/modules/mq/Consumer/CommonConsumer.java b/src/main/java/com/peanut/modules/mq/Consumer/CommonConsumer.java
index fd887e00..3751d430 100644
--- a/src/main/java/com/peanut/modules/mq/Consumer/CommonConsumer.java
+++ b/src/main/java/com/peanut/modules/mq/Consumer/CommonConsumer.java
@@ -37,6 +37,8 @@ public class CommonConsumer {
     private ClassEntityService classEntityService;
     @Autowired
     private CouponHistoryService couponHistoryService;
+    @Autowired
+    private CourseCatalogueDao courseCatalogueDao;
 
     @RabbitListener(queues = DelayQueueConfig.COMMON_QUEUE)
     public void commonConsumer(String typeAndParam) {
@@ -68,14 +70,18 @@ public class CommonConsumer {
                 List<ClassCourse> courses = classCourseDao.selectList(new LambdaQueryWrapper<ClassCourse>()
                         .eq(ClassCourse::getModelId,classEntity.getModelId()));
                 for (ClassCourse classCourse:courses){
-                    List<UserCourseBuyEntity> ucb = userCourseBuyDao.selectList(new LambdaQueryWrapper<UserCourseBuyEntity>()
-                            .eq(UserCourseBuyEntity::getUserId,user.getId())
-                            .eq(UserCourseBuyEntity::getCourseId,classCourse.getCourseId()));
-                    if (ucb.size() == 0){
-                        Map<String,Object> map = new HashMap<>();
-                        map.put("classId",classEntity.getId());
-                        map.put("userId",user.getId());
-                        classEntityService.quitClass(map);
+                    List<CourseCatalogueEntity> catalogues = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>()
+                            .eq(CourseCatalogueEntity::getCourseId,classCourse.getCourseId()));
+                    for (CourseCatalogueEntity catalog:catalogues){
+                        int ucbCount = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
+                                .eq(UserCourseBuyEntity::getUserId,user.getId())
+                                .eq(UserCourseBuyEntity::getCatalogueId,catalog.getId()));
+                        if (ucbCount == 0){
+                            Map<String,Object> map = new HashMap<>();
+                            map.put("classId",classEntity.getId());
+                            map.put("userId",user.getId());
+                            classEntityService.quitClass(map);
+                        }
                     }
                 }
             }