Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseRepliedServiceImpl.java

@@ -201,7 +201,6 @@ public class CourseRepliedServiceImpl extends ServiceImpl<CourseScheduleRepliedD
         QueryWrapper<CourseScheduleStudentPayment> wrapper = new QueryWrapper<>();
         wrapper.eq("user_id_", userId);
         wrapper.eq("course_id_", scheduleId);
-        wrapper.eq("course_type_", CourseScheduleEnum.PRACTICE.getCode());
         CourseScheduleStudentPayment payment = paymentDao.selectOne(wrapper);
         if (payment == null) {
             throw new RuntimeException("学生未购买该课无法评论");

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -467,10 +467,7 @@
                 AND salaryStatus = #{param.salaryStatus}
             </if>
             <if test="param.startTime != null">
-                AND startTime &lt;= #{param.startTime}
-            </if>
-            <if test="param.endTime != null">
-                AND endTime &gt;= #{param.endTime}
+                AND cs.class_date_ BETWEEN #{param.startTime} AND #{param.endTime}
             </if>
             <if test="param.studentId != null">
                 AND studentId = #{param.studentId}