shangke 2 years ago
parent
commit
8ac036d9b9

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -215,6 +215,9 @@ public class CourseSchedule  extends BaseEntity{
 	@ApiModelProperty("全员静音")
 	private Boolean muteAll;
 
+	@ApiModelProperty("授课直播间编号")
+	private String liveRoomId;
+
 	public Boolean getSettlementReportFlag() {
 		return settlementReportFlag;
 	}
@@ -696,6 +699,14 @@ public class CourseSchedule  extends BaseEntity{
 		return type;
 	}
 
+	public String getLiveRoomId() {
+		return liveRoomId;
+	}
+
+	public void setLiveRoomId(String liveRoomId) {
+		this.liveRoomId = liveRoomId;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -13,6 +13,7 @@ import java.util.stream.Collectors;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -59,30 +60,6 @@ import com.ym.mec.biz.dal.dao.VipGroupDao;
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesCycleDao;
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
 import com.ym.mec.biz.dal.dao.VipGroupStudentCoursePriceDao;
-import com.ym.mec.biz.dal.dto.ActivityUserDto;
-import com.ym.mec.biz.dal.dto.BaseMapDto;
-import com.ym.mec.biz.dal.dto.GroupUserDto;
-import com.ym.mec.biz.dal.dto.ReturnFeeDto;
-import com.ym.mec.biz.dal.dto.SimpleUserDto;
-import com.ym.mec.biz.dal.dto.StudentCourseInfoDto;
-import com.ym.mec.biz.dal.dto.StudentRecoverInfoDto;
-import com.ym.mec.biz.dal.dto.StudentVipGroupDetailDto;
-import com.ym.mec.biz.dal.dto.StudentVipGroupShowListDto;
-import com.ym.mec.biz.dal.dto.TeacherBasicDto;
-import com.ym.mec.biz.dal.dto.TeachingRecordBaseInfo;
-import com.ym.mec.biz.dal.dto.VipBuyResultDto;
-import com.ym.mec.biz.dal.dto.VipGroupApplyBaseInfoDto;
-import com.ym.mec.biz.dal.dto.VipGroupApplyDto;
-import com.ym.mec.biz.dal.dto.VipGroupBuyParamsDto;
-import com.ym.mec.biz.dal.dto.VipGroupClassGroupMapper;
-import com.ym.mec.biz.dal.dto.VipGroupCourseSchduleRecordDto;
-import com.ym.mec.biz.dal.dto.VipGroupManageDetailDto;
-import com.ym.mec.biz.dal.dto.VipGroupPayInfoDto;
-import com.ym.mec.biz.dal.dto.VipGroupSalaryBaseInfo;
-import com.ym.mec.biz.dal.dto.VipGroupSalaryDto;
-import com.ym.mec.biz.dal.dto.VipGroupSalarySettlementDto;
-import com.ym.mec.biz.dal.dto.VipGroupSalarySettlementTypeDto;
-import com.ym.mec.biz.dal.dto.VipGroupStudentDto;
 import com.ym.mec.biz.dal.entity.ActivityUserMapper;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
@@ -354,10 +331,22 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
         // LIVE课参数校验
         if (CourseSchedule.CourseScheduleType.LIVE.getCode().equals(groupType)) {
-            // TODO: 2020/3/18 LIVE课参数校验
+
+            ImLiveBroadcastRoomDto liveRoom = vipGroup.getLiveBroadcastRoom();
+            if (Objects.isNull(liveRoom) || Objects.isNull(liveRoom.getRoomConfig())) {
+                throw new BizException("直播间参数错误");
+            }
+
+            if (StringUtils.isAnyBlank(liveRoom.getRoomTitle(), liveRoom.getLiveRemark(), liveRoom.getOs())
+                    || Objects.isNull(liveRoom.getUseScene())) {
+                throw new BizException("直播间参数错误");
+            }
         }
 
-        List<String> studentNames = studentDao.getStudentNames(canBuyStudentIds);
+        List<String> studentNames = Lists.newArrayList();
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(canBuyStudentIds)) {
+            studentNames = studentDao.getStudentNames(canBuyStudentIds);
+        }
 
         //生成vip课信息
         List<String> bySubIds = subjectDao.findBySubIds(vipGroupApplyBaseInfoDto.getSubjectIdList());