From 27557eb7eaf2ccf2ed2970e26b8831d88908b176 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 17 Jun 2024 15:47:44 +0800
Subject: [PATCH] bug

---
 .../modules/common/entity/CourseEntity.java   |  2 +-
 .../controller/CourseController.java          | 36 +++++++++----------
 .../service/impl/CourseServiceImpl.java       | 10 +++---
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java
index 18e55a62..dcb1d854 100644
--- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java
+++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java
@@ -47,5 +47,5 @@ public class CourseEntity {
     @TableField(exist = false)
     private Integer selective;
     @TableField(exist = false)
-    private boolean isBuy;
+    private Integer isBuy;
 }
diff --git a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java
index 2b69b8f8..21487bc4 100644
--- a/src/main/java/com/peanut/modules/sociology/controller/CourseController.java
+++ b/src/main/java/com/peanut/modules/sociology/controller/CourseController.java
@@ -95,19 +95,19 @@ public class CourseController {
         return R.ok().put("courses",sociologyCourseList);
     }
 
-//    /**
-//     * 加入收藏（加入正在学习）
-//     * @param map
-//     * @return
-//     */
-//    @RequestMapping("/addUserCourseStudying")
-//    public R addUserCourseStudying(@RequestBody Map<String,Integer> map){
-//        UserCourseStudying userCourseStudying = new UserCourseStudying();
-//        userCourseStudying.setUserId(ShiroUtils.getUId());
-//        userCourseStudying.setCatalogueId(map.get("catalogueId"));
-//        userCourseStudyingDao.insert(userCourseStudying);
-//        return R.ok().put("result",userCourseStudying);
-//    }
+    /**
+     * 加入收藏（加入正在学习）
+     * @param map
+     * @return
+     */
+    @RequestMapping("/addUserCourseStudying")
+    public R addUserCourseStudying(@RequestBody Map<String,Integer> map){
+        UserCourseStudying userCourseStudying = new UserCourseStudying();
+        userCourseStudying.setUserId(ShiroUtils.getUId());
+        userCourseStudying.setCatalogueId(map.get("catalogueId"));
+        userCourseStudyingDao.insert(userCourseStudying);
+        return R.ok().put("result",userCourseStudying);
+    }
 
     /**
      * 移出收藏（移出正在学习）
@@ -196,11 +196,11 @@ public class CourseController {
         return R.ok().put("courses",courses);
     }
 
-    //添加正在学习（收藏）
-    @RequestMapping("/addUserCourseStudying")
-    public R addUserCourseStudying(@RequestBody UserCourseStudying userCourseStudying){
-        return R.ok().put("success",courseService.addUserCourseStudying(userCourseStudying));
-    }
+//    //添加正在学习（收藏）
+//    @RequestMapping("/addUserCourseStudying")
+//    public R addUserCourseStudying(@RequestBody UserCourseStudying userCourseStudying){
+//        return R.ok().put("success",courseService.addUserCourseStudying(userCourseStudying));
+//    }
 
     //移除正在学习（收藏）
     @RequestMapping("/delUserCourseStudying")
diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
index 41887b11..8726acd4 100644
--- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
@@ -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);
         for (CourseEntity c:courseEntityPage.getRecords()){
             Integer integer = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>().eq(UserCourseBuyEntity::getCourseId, c.getId()).eq(UserCourseBuyEntity::getUserId,uId));
-            if(integer>0){
-                c.setBuy(true);
-            }else {
-                c.setBuy(false);
-            }
+            c.setIsBuy(integer>0?1:0);
             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);
         }
         return courseEntityPage;