Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into feature/0529-live

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseScheduleDto.java

@@ -102,6 +102,9 @@ public class CourseScheduleDto extends CourseSchedule {
     @ApiModelProperty("直播间信息")
     private ImLiveBroadcastRoomDto liveBroadcastRoom;
 
+    @ApiModelProperty("直播客户端")
+    private String os;
+
     public int getEnableAssignHomework() {
         return enableAssignHomework;
     }
@@ -359,4 +362,12 @@ public class CourseScheduleDto extends CourseSchedule {
     public void setLiveBroadcastRoom(ImLiveBroadcastRoomDto liveBroadcastRoom) {
         this.liveBroadcastRoom = liveBroadcastRoom;
     }
+
+    public String getOs() {
+        return os;
+    }
+
+    public void setOs(String os) {
+        this.os = os;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/GroupType.java

@@ -19,7 +19,6 @@ public enum GroupType implements BaseEnum<String, GroupType> {
 	ACTIVITY("活动购买"),
 	MEMBER("购买会员"),
 	LIVE_BUY("直播购物"),
-
 	MALL_SELL("商城购物"),
 	LIVE("直播课"),
 	;

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

@@ -1148,6 +1148,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 			// 设置直播间配置
 			courseScheduleDto.setLiveBroadcastRoom(liveRoomMap.get(courseScheduleDto.getMusicGroupId()));
+			if (Objects.nonNull(courseScheduleDto.getLiveBroadcastRoom())) {
+				courseScheduleDto.setOs(courseScheduleDto.getLiveBroadcastRoom().getOs());
+			}
         }
         result.put("list", studentCourseSchedulesWithDate);
         return result;
@@ -1360,6 +1363,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 			// 直播课直播间配置
 			courseScheduleDto.setLiveBroadcastRoom(liveRoomMap.get(courseScheduleDto.getMusicGroupId()));
+			if (Objects.nonNull(courseScheduleDto.getLiveBroadcastRoom())) {
+				courseScheduleDto.setOs(courseScheduleDto.getLiveBroadcastRoom().getOs());
+			}
 		}
         return teacherCourseSchedulesWithDate;
     }

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

@@ -2187,6 +2187,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
             VipGroupCategory vipGroupCategory = vipGroupCategoryService.get(vipGroup.getVipGroupCategoryId());
             vipGroupDetail.setCategoryName(vipGroupCategory.getName());
             vipGroupDetail.setNumberOfClasses(vipGroupDao.countTeacherVipGroups(vipGroupDetail.getTeacherId().longValue()));
+            vipGroupDetail.setLiveConfigJson(vipGroup.getLiveConfigJson());
             return vipGroupDetail;
         }
     }
@@ -2740,19 +2741,19 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 //退还优惠券
                 sysCouponCodeService.quit(order.getCouponCodeId());
             } else {
+                //生成班级学员关联
+                ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
+                classGroupStudentMapper.setMusicGroupId(classGroup.getMusicGroupId());
+                classGroupStudentMapper.setClassGroupId(classGroup.getId());
+                classGroupStudentMapper.setUserId(userId);
+                classGroupStudentMapper.setCreateTime(date);
+                classGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.NORMAL);
+                classGroupStudentMapper.setGroupType(groupType);
+                classGroupStudentMapperDao.insert(classGroupStudentMapper);
                 if(groupType == VIP){
                     //活动赠送
                     studentPaymentOrderService.activityGive(vipGroup.getVipGroupActivityId(), order,
                             vipGroup.getId().toString(), null);
-                    //生成班级学员关联
-                    ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
-                    classGroupStudentMapper.setMusicGroupId(classGroup.getMusicGroupId());
-                    classGroupStudentMapper.setClassGroupId(classGroup.getId());
-                    classGroupStudentMapper.setUserId(userId);
-                    classGroupStudentMapper.setCreateTime(date);
-                    classGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.NORMAL);
-                    classGroupStudentMapper.setGroupType(groupType);
-                    classGroupStudentMapperDao.insert(classGroupStudentMapper);
                     //获取班级实际人数
                     Integer studentNum = classGroupStudentMapperDao.countGroupNormalStudentNum(groupType, classGroup.getMusicGroupId());
                     //课程组人数已满，变更状态
@@ -2761,7 +2762,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                         classGroup.setDelFlag(0);
                         VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(vipGroup.getVipGroupCategoryId(),
                                 vipGroup.getOrganId(), vipGroup.getGroupType());
-
                         //生成课表
                         List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class);
                         classGroup.setTotalClassTimes(courseSchedules.size());
@@ -4507,16 +4507,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     Integer tenantId = vipGroup.getTenantId();
                     for (String s : vipGroup.getStudentIdList().split(",")) {
                         Integer userId = Integer.parseInt(s);
-                        //生成班级学员关联
-                        ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
-                        classGroupStudentMapper.setMusicGroupId(classGroup.getMusicGroupId());
-                        classGroupStudentMapper.setClassGroupId(classGroup.getId());
-                        classGroupStudentMapper.setUserId(userId);
-                        classGroupStudentMapper.setCreateTime(now);
-                        classGroupStudentMapper.setStatus(ClassGroupStudentStatusEnum.NORMAL);
-                        classGroupStudentMapper.setGroupType(GroupType.LIVE);
-                        classGroupStudentMapperDao.insert(classGroupStudentMapper);
-
                         classGroup.setDelFlag(0);
                         VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(vipGroup.getVipGroupCategoryId(),
                                 vipGroup.getOrganId(), vipGroup.getGroupType());

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

@@ -733,7 +733,8 @@
         IF(ta.sign_out_status_ IS NULL,0,1) sign_out_status_,
         cs.teach_mode_,
         cs.live_room_id_,
-        cs.group_type_
+        cs.group_type_,
+        cs.music_group_id_
         FROM
         course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_