From 6e04aafa7ae88bdb02638ec33eedf19e5a2452a6 Mon Sep 17 00:00:00 2001
From: wuchunlei <mailcauchy@gmail.com>
Date: Wed, 27 Nov 2024 09:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E8=B4=AD=E4=B9=B0?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ClassEntityServiceImpl.java  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 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 022419f8..b031d1e2 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
@@ -319,7 +319,9 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
                             if (ucbCount == 0){
                                 flag = true;
                                 CourseEntity c = courseDao.selectById(classCourse.getCourseId());
-                                sb.append("用户"+ user.getTel()+"未购买课程"+c.getTitle()+"-"+catalog.getTitle()+";\n");
+                                String userName = StringUtils.isNotBlank(user.getName())?user.getName():user.getNickname();
+                                String userNumber = StringUtils.isNotBlank(user.getTel())?user.getTel():user.getEmail();
+                                sb.append("用户"+userName+"-"+userNumber+"未购买课程"+c.getTitle()+"-"+catalog.getTitle()+";\n");
                             }
                         }
                     }
@@ -579,13 +581,17 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
                 }else {
                     if (courses.size() > 0){
                         for (CourseEntity course : courses) {
-                            int count = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
-                                    .eq(UserCourseBuyEntity::getUserId,user.getId())
-                                    .eq(UserCourseBuyEntity::getCourseId,course.getId()));
-                            if (count > 0){
-                                sb.append(course.getTitle()+"已购买 ");//空格用来分割多门课程
-                            }else {
-                                sb.append(course.getTitle()+"未购买 ");
+                            List<CourseCatalogueEntity> catalogues = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>()
+                                    .eq(CourseCatalogueEntity::getCourseId,course.getId()));
+                            for (CourseCatalogueEntity catalog:catalogues){
+                                int ucbCount = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
+                                        .eq(UserCourseBuyEntity::getUserId,user.getId())
+                                        .eq(UserCourseBuyEntity::getCatalogueId,catalog.getId()));
+                                if (ucbCount > 0){
+                                    sb.append(course.getTitle()+"-"+catalog.getTitle()+"已购买 ");//空格用来分割多门课程
+                                }else {
+                                    sb.append(course.getTitle()+"-"+catalog.getTitle()+"未购买 ");
+                                }
                             }
                         }
                     }