zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java into zcc

Browse Source
This commit is contained in:
wuchunlei
2024-06-18 09:45:07 +08:00
parent 264f1f7ab9 27557eb7ea
commit ae3dcd1b10
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/peanut/modules/common/entity/CourseEntity.java
View File

@@ -47,5 +47,5 @@ public class CourseEntity {
@TableField(exist = false) @TableField(exist = false)
private Integer selective; private Integer selective;
@TableField(exist = false) @TableField(exist = false)
private boolean isBuy; private Integer isBuy;
} }

36
src/main/java/com/peanut/modules/sociology/controller/CourseController.java
View File

@@ -95,19 +95,19 @@ public class CourseController {
return R.ok().put("courses",sociologyCourseList); return R.ok().put("courses",sociologyCourseList);
} }
// /** /**
// * 加入收藏（加入正在学习） * 加入收藏（加入正在学习）
// * @param map * @param map
// * @return * @return
// */ */
// @RequestMapping("/addUserCourseStudying") @RequestMapping("/addUserCourseStudying")
// public R addUserCourseStudying(@RequestBody Map<String,Integer> map){ public R addUserCourseStudying(@RequestBody Map<String,Integer> map){
// UserCourseStudying userCourseStudying = new UserCourseStudying(); UserCourseStudying userCourseStudying = new UserCourseStudying();
// userCourseStudying.setUserId(ShiroUtils.getUId()); userCourseStudying.setUserId(ShiroUtils.getUId());
// userCourseStudying.setCatalogueId(map.get("catalogueId")); userCourseStudying.setCatalogueId(map.get("catalogueId"));
// userCourseStudyingDao.insert(userCourseStudying); userCourseStudyingDao.insert(userCourseStudying);
// return R.ok().put("result",userCourseStudying); return R.ok().put("result",userCourseStudying);
// } }
/** /**
* 移出收藏（移出正在学习） * 移出收藏（移出正在学习）
@@ -196,11 +196,11 @@ public class CourseController {
return R.ok().put("courses",courses); return R.ok().put("courses",courses);
} }
//添加正在学习（收藏） // //添加正在学习（收藏）
@RequestMapping("/addUserCourseStudying") // @RequestMapping("/addUserCourseStudying")
public R addUserCourseStudying(@RequestBody UserCourseStudying userCourseStudying){ // public R addUserCourseStudying(@RequestBody UserCourseStudying userCourseStudying){
return R.ok().put("success",courseService.addUserCourseStudying(userCourseStudying)); // return R.ok().put("success",courseService.addUserCourseStudying(userCourseStudying));
} // }
//移除正在学习（收藏） //移除正在学习（收藏）
@RequestMapping("/delUserCourseStudying") @RequestMapping("/delUserCourseStudying")

10
src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
View File

@@ -68,12 +68,12 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, CourseEntity> impl
Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper); Page<CourseEntity> courseEntityPage = this.getBaseMapper().selectJoinPage(new Page<>(param.getPage(), param.getLimit()),CourseEntity.class, wrapper);
for (CourseEntity c:courseEntityPage.getRecords()){ for (CourseEntity c:courseEntityPage.getRecords()){
Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCourseId, c.getId()).eq(UserCourseBuyEntity::getUserId,uId)); Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCourseId, c.getId()).eq(UserCourseBuyEntity::getUserId,uId));
if(integer>0){ c.setIsBuy(integer>0?1:0);
c.setBuy(true);
}else {
c.setBuy(false);
}
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId())); List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, c.getId()));
for (CourseCatalogueEntity cc:courseCatalogueEntities){
Integer integer1 = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCatalogueId, cc.getId()).eq(UserCourseBuyEntity::getUserId, uId));
cc.setIsBuy(integer1>0?1:0);
}
c.setCourseCatalogueEntityList(courseCatalogueEntities); c.setCourseCatalogueEntityList(courseCatalogueEntities);
} }
return courseEntityPage; return courseEntityPage;