bug修复

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

@@ -905,7 +905,12 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
 
         RLock lock = redissonClient.getLock("buyPractice:teacherId:" + scheduleDto.getTeacherId());
         try {
-            if (lock.tryLock(20, 10, TimeUnit.SECONDS)) {
+            if (lock.tryLock(60, 20, TimeUnit.SECONDS)) {
+                //批量检查老师课时在数据库是否重复
+                batchCheckTeacherCourseTime(scheduleDto.getTeacherId(), dateList, CourseScheduleDate::getStartTime, CourseScheduleDate::getEndTime);
+                //批量检查学生课时在数据库是否重复
+                batchCheckStudentCourseTime(studentId, dateList, CourseScheduleDate::getStartTime, CourseScheduleDate::getEndTime);
+
                 String orderNo = orderReqInfo.getOrderNo();
                 scheduleDto.setType(CourseScheduleEnum.PRACTICE.getCode());
                 scheduleDto.setStatus(CourseGroupEnum.NOT_SALE.getCode());
@@ -973,7 +978,7 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
         } finally {
             lock.unlock();
         }
-        return null;
+        return HttpResponseResult.failed();
     }
 
     /**

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyFollow.java

@@ -28,6 +28,8 @@ public class MyFollow extends BaseEntity {
     private Integer expTime;
     @ApiModelProperty("是否在直播")
     private Integer liveFlag;
+    @ApiModelProperty("房间编号")
+    private String roomUid;
 
     @ApiModelProperty("音乐人(0:否 1:是)")
     private Integer musicianFlag;
@@ -36,6 +38,14 @@ public class MyFollow extends BaseEntity {
     @ApiModelProperty("专业技能")
     private String subjectName;
 
+    public String getRoomUid() {
+        return roomUid;
+    }
+
+    public void setRoomUid(String roomUid) {
+        this.roomUid = roomUid;
+    }
+
     public Integer getEntryFlag() {
         return entryFlag;
     }

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

@@ -122,19 +122,19 @@
             u.username_ AS userName,
             u.real_name_ AS realName,
             u.gender_ AS gender,
-
             t.star_grade_ AS starGrade,
             t.fans_num_ AS fansNum,
             t.live_flag_ AS liveFlag,
             t.exp_time_ AS expTime,
-
             tr.musician_flag_ AS musicianFlag,
             tr.entry_flag_ AS entryFlag,
-            (SELECT group_concat(name_) FROM `subject` WHERE find_in_set(id_,tr.subject_id_)) AS subjectName
+            (SELECT group_concat( name_ ) FROM `subject` WHERE find_in_set( id_, tr.subject_id_ )) AS subjectName,
+            r.room_uid_ AS roomUid
         FROM student_star s
         LEFT JOIN sys_user u ON s.teacher_id_ = u.id_
         LEFT JOIN teacher_total t ON s.teacher_id_ = t.user_id_
         LEFT JOIN teacher tr ON s.teacher_id_ = tr.user_id_
+        LEFT JOIN (SELECT room_uid_,speaker_id_ FROM live_room WHERE live_state_=1) r ON t.user_id_= r.speaker_id_
         WHERE s.student_id_ = #{studentId}
     </select>
     <delete id="unfollow" parameterType="java.util.Map">