Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/ImLiveBroadcastRoomService.java

@@ -236,5 +236,7 @@ public interface ImLiveBroadcastRoomService extends IService<ImLiveBroadcastRoom
      * @return TencentWrapper.LiveStreamState
      */
     TencentWrapper.LiveStreamState roomLiveStreamStatus(String roomUid);
+
+    void batchUpdateLiveRoomTitle(List<String> list, String roomTitle, String liveRemark);
 }
 

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

@@ -3067,6 +3067,15 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         return liveStreamState;
     }
 
+    @Override
+    public void batchUpdateLiveRoomTitle(List<String> list, String roomTitle, String liveRemark) {
+        this.lambdaUpdate()
+                .in(ImLiveBroadcastRoom::getRoomUid, list)
+                .set(ImLiveBroadcastRoom::getRoomTitle, roomTitle)
+                .set(ImLiveBroadcastRoom::getLiveRemark, liveRemark)
+                .update();
+    }
+
 
     /**
      * 查询直播间所有用户信息

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

@@ -436,6 +436,30 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             courseSchedule.setName(vipGroupApplyBaseInfoDto.getName());
             courseSchedule.setOrganId(vipGroupApplyBaseInfoDto.getOrganId());
         });
+        if (vipGroupApplyBaseInfoDto.getStatus().equals(VipGroupStatusEnum.PROGRESS)) {
+            // 修改课程信息
+            // 修改直播间标题
+
+            // 查询未开始课程信息
+            List<CourseSchedule> scheduleList = courseScheduleDao.findByClassGroupAndStatus(classGroup.getId(), CourseStatusEnum.NOT_START.getCode());
+            Map<Long, CourseSchedule> scheduleMap = courseSchedules.stream().collect(Collectors.toMap(CourseSchedule::getId, Function.identity()));
+            scheduleList.forEach(courseSchedule -> {
+                CourseSchedule schedule = scheduleMap.get(courseSchedule.getId());
+                if(schedule == null ) {
+                    return;
+                }
+                courseSchedule.setName(vipGroupApplyBaseInfoDto.getName());
+                courseSchedule.setTeachingContent(schedule.getTeachingContent());
+                courseSchedule.setTeachingPoint(schedule.getTeachingPoint());
+            });
+            courseScheduleDao.batchUpdate(scheduleList);
+
+            // 直播间ID
+            List<String> list = scheduleList.stream().map(CourseSchedule::getLiveRoomId).filter(Objects::nonNull).collect(Collectors.toList());
+            if (list.size() > 0) {
+                imLiveBroadcastRoomService.batchUpdateLiveRoomTitle(list, vipGroup.getLiveBroadcastRoom().getRoomTitle(),vipGroup.getLiveBroadcastRoom().getLiveRemark());
+            }
+        }
 
         courseScheduleService.checkNewCourseSchedules(courseSchedules, false, false);
         vipGroupApplyBaseInfoDto.setCourseSchedulesJson(JSON.toJSONString(courseSchedules));
@@ -4780,7 +4804,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
         // 设置课程
         List<CourseSchedule> courseSchedules = JSON.parseArray(baseInfoDto.getCourseSchedulesJson(), CourseSchedule.class);
+        if (vipGroup.getStatus().equals(VipGroupStatusEnum.PROGRESS)) {
+            // 修改课程信息
+            ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroup.getId(), GroupType.LIVE.getCode());
 
+            // 查询未开始课程信息
+            courseSchedules = courseScheduleDao.findClassGroupCourseSchedules(classGroup.getId());
+
+        }
         vipGroupApplyDto.setCourseSchedules(courseSchedules);
 
         // 直播信息

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -1360,6 +1360,9 @@
                 <if test="item.classDate != null">
                     class_date_ = #{item.classDate},
                 </if>
+                <if test="item.name != null">
+                    name_ = #{item.name},
+                </if>
                 <if test="item.endClassTime != null">
                     end_class_time_ = #{item.endClassTime},
                 </if>

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -254,13 +254,13 @@
          update_time_,teacher_school_id_,online_classes_num_,offline_classes_num_,registration_start_time_,
          name_,organ_id_list_,vip_group_activity_id_,group_status_,online_classes_unit_price_,offline_classes_unit_price_,
          total_price_,give_teach_mode_,vip_group_category_id_,organ_id_,stop_reason_,memo_,audit_status_,courses_start_date,
-         course_schedules_json_,student_id_list_,tenant_id_, group_type_, live_config_json_,original_total_price_)
+         course_schedules_json_,student_id_list_,tenant_id_, group_type_, live_config_json_,original_total_price_,subject_id_)
         VALUES(#{id},#{userId},#{singleClassMinutes},#{paymentExpireDate},#{coursesExpireDate},now(),now(),#{teacherSchoolId},
                #{onlineClassesNum},#{offlineClassesNum},#{registrationStartTime},#{name},#{organIdList},#{vipGroupActivityId},
                #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{onlineClassesUnitPrice},#{offlineClassesUnitPrice},
                #{totalPrice},#{giveTeachMode},#{vipGroupCategoryId},#{organId},#{stopReason},#{memo},
                #{auditStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{courseStartDate},#{courseSchedulesJson},#{studentIdList},#{tenantId},
-               #{groupType}, #{liveConfigJson},#{originalTotalPrice})
+               #{groupType}, #{liveConfigJson},#{originalTotalPrice},#{subjectId})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -340,6 +340,9 @@
             <if test="originalTotalPrice != null">
                 original_total_price_=#{originalTotalPrice},
             </if>
+            <if test="subjectId != null">
+                subject_id_=#{subjectId},
+            </if>
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>