diff --git a/src/main/java/com/sqx/modules/app/response/CourseOrderResponse.java b/src/main/java/com/sqx/modules/app/response/CourseOrderResponse.java index de3a2fbc..5158c407 100644 --- a/src/main/java/com/sqx/modules/app/response/CourseOrderResponse.java +++ b/src/main/java/com/sqx/modules/app/response/CourseOrderResponse.java @@ -22,4 +22,5 @@ public class CourseOrderResponse implements Serializable { * 售卖金币 */ private Double coursemoney; + private Long courseId; } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 67e45144..4a1ed2ea 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -47,11 +47,14 @@ import com.sqx.modules.app.dto.AuthDTO; import com.sqx.modules.app.dto.AuthRespDTO; import com.sqx.modules.app.entity.*; import com.sqx.modules.app.mapper.TbUserBlacklistMapper; +import com.sqx.modules.app.response.CourseOrderResponse; import com.sqx.modules.app.service.*; import com.sqx.modules.app.utils.JwtUtils; import com.sqx.modules.app.utils.UserConstantInterface; import com.sqx.modules.common.entity.CommonInfo; import com.sqx.modules.common.service.CommonInfoService; +import com.sqx.modules.course.dao.CourseDao; +import com.sqx.modules.course.entity.Course; import com.sqx.modules.discSpinning.service.DiscSpinningService; import com.sqx.modules.file.utils.Md5Utils; import com.sqx.modules.invite.service.InviteService; @@ -130,6 +133,8 @@ public class UserServiceImpl extends ServiceImpl implements private ReentrantReadWriteLock reentrantReadWriteLock = new ReentrantReadWriteLock(true); + @Autowired + private CourseDao courseDao; public UserServiceImpl(@Lazy AliService aliService, UserInfoService userInfoService, UserVipDao userVipDao, InviteAchievementService inviteAchievementService) { this.aliService = aliService; @@ -1423,8 +1428,21 @@ public class UserServiceImpl extends ServiceImpl implements } PageHelper.startPage(page.intValue(), limit.intValue()); - List> list = baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId); - PageInfo> pageInfo = new PageInfo<>(list); + List courseList = courseDao.selectGroupCourseId(startTime, endTime); + Set collect = courseList.stream().map(CourseOrderResponse::getCourseId).collect(Collectors.toSet()); + if (!collect.isEmpty()) { + Map courseMap = courseDao.selectList(new LambdaQueryWrapper().in(Course::getCourseId, collect).select(Course::getCourseId, Course::getTitle)) + .stream().collect(Collectors.toMap(Course::getCourseId, item -> item)); + courseList.forEach(item -> { + Course course = courseMap.get(item.getCourseId()); + if (course != null) { + item.setCoursename(course.getTitle()); + } + }); + } + PageInfo pageInfo = new PageInfo<>(courseList); +// List> list = baseMapper.queryCourseOrder(type, startTime, endTime, sysUserId); +// PageInfo> pageInfo = new PageInfo<>(list); return PageUtils.page(pageInfo, true); } diff --git a/src/main/java/com/sqx/modules/course/dao/CourseDao.java b/src/main/java/com/sqx/modules/course/dao/CourseDao.java index 549e2c01..e939b845 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseDao.java @@ -1,6 +1,7 @@ package com.sqx.modules.course.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.sqx.modules.app.response.CourseOrderResponse; import com.sqx.modules.course.entity.Course; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -39,4 +40,6 @@ public interface CourseDao extends BaseMapper { * @return */ List> selectCourseTitle(@Param("title")String title); + + List selectGroupCourseId(@Param("start")String startTime, @Param("end") String endTime); } diff --git a/src/main/resources/mapper/course/CourseDao.xml b/src/main/resources/mapper/course/CourseDao.xml index 4154d796..c0ac0eed 100644 --- a/src/main/resources/mapper/course/CourseDao.xml +++ b/src/main/resources/mapper/course/CourseDao.xml @@ -236,5 +236,13 @@ order by create_time desc +