Merge remote-tracking branch 'origin/master'

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

@@ -194,10 +194,13 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 
 		//创建班级
 		ClassGroup classGroup=new ClassGroup();
+		classGroup.setMusicGroupId(demoGroup.getId().toString());
 		classGroup.setName(demoGroup.getName());
 		classGroup.setType(ClassGroupTypeEnum.DEMO);
 		classGroup.setDelFlag(YesOrNoEnum.NO);
 		classGroup.setTotalClassTimes(1);
+		classGroup.setCreateTime(now);
+		classGroup.setUpdateTime(now);
 		classGroupDao.insert(classGroup);
 
 		//创建试听课班级映射

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

@@ -482,8 +482,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		VipGroupManageDetailDto vipGroupBaseInfo = vipGroupDao.getVipGroupBaseInfo(vipGroupId);
 		vipGroupBaseInfo.setSubjectName(StringUtils.join(subjectDao.findBySubIds(vipGroupBaseInfo.getSubjectIdList()),","));
 		ClassGroupTeacherSalary byVipGoupAndTeacher = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupId.intValue(), vipGroupBaseInfo.getUserId());
-		vipGroupBaseInfo.setOnlineTeacherSalary(byVipGoupAndTeacher.getOnlineClassesSalary());
-		vipGroupBaseInfo.setOfflineTeacherSalary(byVipGoupAndTeacher.getSalary());
+		if(Objects.nonNull(byVipGoupAndTeacher)){
+			vipGroupBaseInfo.setOnlineTeacherSalary(byVipGoupAndTeacher.getOnlineClassesSalary());
+			vipGroupBaseInfo.setOfflineTeacherSalary(byVipGoupAndTeacher.getSalary());
+		}
 		return vipGroupBaseInfo;
 	}
 
@@ -1044,6 +1046,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     		throw new BizException("未找到指定vip课");
 		}
 
+		if(vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)){
+			throw new BizException("此课程还未正式开课");
+		}
+
 		PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);