Merge remote-tracking branch 'origin/correct' into correct

src/main/java/cn/seecoder/courselearning/serviceimpl/course/CourseServiceImpl.java

@@ -89,7 +89,11 @@ public class CourseServiceImpl implements CourseService {
                 bought = order.getStatus().equals(Constant.ORDER_STATUS_SUCCESS);
             manageable = uid.equals(course.getTeacherId());
         }
-        return new CourseVO(course, bought, manageable);
+        int likes=courseLikesMapper.count(courseId, uid) ;
+        if(likes>0)
+            return new CourseVO(course, bought, manageable,likes);
+        else
+            return new CourseVO(course, bought, manageable);
     }
 
     @Override
@@ -138,6 +142,10 @@ public class CourseServiceImpl implements CourseService {
                 if(order != null)
                     vo.setBought(order.getStatus().equals(Constant.ORDER_STATUS_SUCCESS));
                 vo.setManageable(uid.equals(vo.getTeacherId()));
+                int liked = courseLikesMapper.count(vo.getId(),uid);
+                if(liked>0){
+                    vo.setLiked(true);
+                }
             }
         }
         return result;

src/main/java/cn/seecoder/courselearning/vo/course/CourseVO.java

@@ -32,6 +32,8 @@ public class CourseVO {
 
     // 课程点赞数
     private Integer likes;
+    // 是否点过赞
+    private boolean liked;
 
     // 标记当前用户（学生）是否已购买解锁
     private boolean bought;
@@ -74,4 +76,21 @@ public class CourseVO {
         this.bought = bought;
         this.manageable = manageable;
     }
+
+    public CourseVO(@NonNull Course course, boolean bought, boolean manageable, int courselikes){
+        id = course.getId();
+        name = course.getName();
+        type = course.getType();
+        intro = course.getIntro();
+        picture = course.getPicture();
+        school = course.getSchool();
+        createTime = course.getCreateTime();
+        cost = course.getCost();
+        teacherId = course.getTeacherId();
+        teacherName = course.getTeacherName();
+        likes = courselikes;
+        liked = courselikes>0;
+        this.bought = bought;
+        this.manageable = manageable;
+    }
 }