瀏覽代碼

1、vip课列表增加字段;
2、vip课导出增加字段;

Joburgess 5 年之前
父節點
當前提交
2d1d0de513

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

@@ -2085,7 +2085,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			if(Objects.nonNull(classGroupTeacherSalary)){
 				teacherSalary=vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE)?classGroupTeacherSalary.getSalary():classGroupTeacherSalary.getOnlineClassesSalary();
 			}
-			if(teacherSalary.compareTo(BigDecimal.ZERO)<=0){
+			if(Objects.isNull(teacherSalary)||teacherSalary.compareTo(BigDecimal.ZERO)<=0){
 				TeacherDefaultVipGroupSalary tdvs = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(courseSchedules.get(0).getActualTeacherId(),vipGroup.getVipGroupCategoryId());
 				if (tdvs == null||Objects.isNull(tdvs.getOfflineClassesSalary())) {
 					throw new BizException("老师[]没有设置默认课酬,请先设置", courseSchedules.get(0).getActualTeacherId());

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

@@ -2464,6 +2464,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.isNull(vipGroup)){
 			throw new BizException("未找到指定的vip课程");
 		}
+
+//		if(!VipGroupStatusEnum.PROGRESS.equals(vipGroup.getStatus())){
+//			throw new BizException("");
+//		}
+
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId, null);
 
         Integer studentNum = classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId());