update

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/VipGroupServiceImpl.java

@@ -2205,6 +2205,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;
         }
     }
@@ -2758,19 +2759,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());
                     //课程组人数已满，变更状态
@@ -2779,7 +2780,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());