Merge remote-tracking branch 'origin/master'

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

@@ -328,7 +328,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 	@Override
 	public void checkNewCourseSchedules(List<CourseSchedule> courseSchedules,boolean checkExistCourseSchedule){
-		System.out.println(JSON.toJSONString(courseSchedules));
 		//第一节课
 		CourseSchedule firstCourseSchedule = courseSchedules.stream().min(Comparator.comparing(CourseSchedule::getStartClassTime)).get();
 		//最后一节课

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

@@ -76,11 +76,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 
 	@Override
 	public CourseHomeworkStudentDetailDto findCourseHomeworkStudentDetail(Long courseScheduleID, Long userId) {
-		CourseHomework courseHomework = courseHomeworkDao.get(courseScheduleID);
-		if(Objects.isNull(courseHomework)){
-			throw new BizException("作业不存在");
-		}
-		return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseHomework.getCourseScheduleId(), userId);
+		return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
 	}
 
 	@Override

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

@@ -165,10 +165,10 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				teacherAttendanceDao.insert(teacherAttendance);
 			}
 			//修改当前课时
-			classGroup.setId(teacherAttendance.getClassGroupId());
-			classGroup.setCurrentClassTimes(teacherAttendance.getCurrentClassTimes() + 1);
-			classGroup.setUpdateTime(date);
-			classGroupDao.update(classGroup);
+//			classGroup.setId(teacherAttendance.getClassGroupId());
+//			classGroup.setCurrentClassTimes(teacherAttendance.getCurrentClassTimes() + 1);
+//			classGroup.setUpdateTime(date);
+//			classGroupDao.update(classGroup);
 			//新增课堂作业
 			CourseHomework courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
 			courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());

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

@@ -714,7 +714,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		BigDecimal teacherSalaryTimeUnit=new BigDecimal(sysConfigDao.findConfigValue(SysConfigService.TEACHER_SALARY_TIME_UNIT));
 		//课程时长与结算单位时长占比
-		BigDecimal classTimeDuty=new BigDecimal(vipGroup.getSingleClassMinutes()).divide(teacherSalaryTimeUnit);
+		BigDecimal classTimeDuty=new BigDecimal(vipGroup.getSingleClassMinutes()).divide(teacherSalaryTimeUnit,2,BigDecimal.ROUND_DOWN);
 		BigDecimal offlineClassNum=new BigDecimal(vipGroup.getOfflineClassesNum());
 		BigDecimal onlineClassNum=new BigDecimal(vipGroup.getOnlineClassesNum());
 		BigDecimal onlineVipGroupCharge = onlineClassesUnitPrice.multiply(onlineClassNum);
@@ -1433,6 +1433,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			courseSchedule.setStatus(CourseStatusEnum.NOT_START);
 			courseSchedule.setType(CourseSchedule.CourseScheduleType.VIP);
 			courseSchedule.setClassGroupId(classGroup.getId());
+			courseSchedule.setGroupType(GroupType.MUSIC);
+			courseSchedule.setMusicGroupId(vipGroup.getId().toString());
 		});
 		courseScheduleService.batchAddCourseSchedule(vipGroupApplyDto.getCourseSchedules());
 

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -9,6 +9,7 @@ import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.CourseScheduleComplaints;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleComplaintsService;
@@ -82,6 +83,8 @@ public class CourseScheduleController extends BaseController {
             courseSchedule.setTeacherId(classGroupTeacherMappers.get(0).getUserId());
             courseSchedule.setActualTeacherId(classGroupTeacherMappers.get(0).getUserId());
             courseSchedule.setSchoolId(musicGroup.getSchoolId());
+            courseSchedule.setMusicGroupId(musicGroup.getId());
+            courseSchedule.setGroupType(GroupType.MUSIC);
         });
 
         scheduleService.createCourseSchedules(createCourseScheduleDto.getCourseSchedules());