Merge branch 'feature/0529-live' into master_saas

.idea/httpRequests/http-requests-log.http

@@ -1,3 +1,13 @@
+POST https://online.lexiaoya.cn/api-backend/open/schoolTeacherStudent/importPlan?fileUrl=https://polestar-oss.oss-cn-shenzhen.aliyuncs.com/assets/excel/0614/0614单簧管导入表.xlsx
+Content-Length: 0
+Connection: Keep-Alive
+User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
+Accept-Encoding: br,deflate,gzip,x-gzip
+
+<> 2023-06-15T100514.200.json
+
+###
+
 POST http://127.0.0.1:9002/teacherCourseSchedule/liveCoursePage
 authorization: bearer 0071d90f-5623-4ee9-a88e-c7adb09efb1c
 Content-Type: application/json
@@ -670,21 +680,3 @@ Accept-Encoding: br,deflate,gzip,x-gzip
 
 ###
 
-POST http://127.0.0.1:9002/teacherAttendance/getLiveCurrentCourseStudents
-authorization: bearer 97fd8e85-bb3c-4967-8a07-47c44957f94a
-Content-Type: application/json
-Content-Length: 70
-Connection: Keep-Alive
-User-Agent: Apache-HttpClient/4.5.14 (Java/17.0.6)
-Accept-Encoding: br,deflate,gzip,x-gzip
-
-{
-  "courseScheduleId": 2001,
-//  "status": "NORMAL",
-  "search": ""
-}
-
-<> 2023-06-08T155544.200.json
-
-###
-

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -5163,8 +5163,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         schedule.setId(courseSchedule.getId());
         schedule.setTenantId(courseSchedule.getTenantId());
         schedule.setLiveRoomId(roomUid);
-        courseSchedule.setLiveRoomId(roomUid);
-        courseScheduleDao.update(schedule);
+        CourseSchedule courseSchedule1 = courseScheduleDao.get(courseSchedule.getId());
+        if (StringUtils.isBlank(courseSchedule1.getLiveRoomId())) {
+            courseSchedule.setLiveRoomId(roomUid);
+            courseScheduleDao.update(schedule);
+        } else {
+            courseSchedule.setLiveRoomId(courseSchedule1.getLiveRoomId());
+        }
 
     }