|
@@ -176,7 +176,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
@Autowired
|
|
@Autowired
|
|
private CourseScheduleConvertDao courseScheduleConvertDao;
|
|
private CourseScheduleConvertDao courseScheduleConvertDao;
|
|
|
|
|
|
- private final Logger LOGGER = LoggerFactory
|
|
|
|
|
|
+ private final Logger businessLogger = LoggerFactory
|
|
.getLogger(this.getClass());
|
|
.getLogger(this.getClass());
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -1511,6 +1511,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
if(CollectionUtils.isEmpty(courseSchedules)){
|
|
if(CollectionUtils.isEmpty(courseSchedules)){
|
|
throw new BizException("请指定课程");
|
|
throw new BizException("请指定课程");
|
|
}
|
|
}
|
|
|
|
+ businessLogger.info("courseAdjustOnlyWithClassDate: {}",JSON.toJSONString(courseSchedules));
|
|
Map<Long, CourseSchedule> idCourseMap = courseSchedules.stream().collect(Collectors.toMap(CourseSchedule::getId, c -> c));
|
|
Map<Long, CourseSchedule> idCourseMap = courseSchedules.stream().collect(Collectors.toMap(CourseSchedule::getId, c -> c));
|
|
List<Long> courseIds = courseSchedules.stream().map(CourseSchedule::getId).collect(Collectors.toList());
|
|
List<Long> courseIds = courseSchedules.stream().map(CourseSchedule::getId).collect(Collectors.toList());
|
|
List<CourseSchedule> existCourses = courseScheduleDao.findByCourseScheduleIds(courseIds);
|
|
List<CourseSchedule> existCourses = courseScheduleDao.findByCourseScheduleIds(courseIds);
|
|
@@ -4124,7 +4125,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
try {
|
|
try {
|
|
tenantAssetsInfoService.deductAmount(updateList);
|
|
tenantAssetsInfoService.deductAmount(updateList);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
- LOGGER.error("deductAmount >>>>>>>>>",e.getCause());
|
|
|
|
|
|
+ businessLogger.info("deductAmount >>>>>>>>>",e.getCause());
|
|
}
|
|
}
|
|
courseIds = updateList.stream().map(CourseSchedule::getId).collect(Collectors.toList());
|
|
courseIds = updateList.stream().map(CourseSchedule::getId).collect(Collectors.toList());
|
|
List<CourseSchedule> beMergeCourses = courseScheduleDao.getBeMergeCourseWithMainCourseIds(courseIds);
|
|
List<CourseSchedule> beMergeCourses = courseScheduleDao.getBeMergeCourseWithMainCourseIds(courseIds);
|
|
@@ -4936,7 +4937,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
if(StringUtils.isEmpty(courseScheduleIds)){
|
|
if(StringUtils.isEmpty(courseScheduleIds)){
|
|
throw new BizException("参数校验失败");
|
|
throw new BizException("参数校验失败");
|
|
}
|
|
}
|
|
- LOGGER.info("清空老师和学生考勤,user:{},参数:{}",user.getId(),courseScheduleIds);
|
|
|
|
|
|
+ businessLogger.info("清空老师和学生考勤,user:{},参数:{}",user.getId(),courseScheduleIds);
|
|
List<Long> courseScheduleId = courseScheduleTeacherSalaryService.querySettlementScheduleId(courseScheduleIds);
|
|
List<Long> courseScheduleId = courseScheduleTeacherSalaryService.querySettlementScheduleId(courseScheduleIds);
|
|
if(courseScheduleId == null || courseScheduleId.size() == 0){
|
|
if(courseScheduleId == null || courseScheduleId.size() == 0){
|
|
throw new BizException("课程已结算,无法清除考勤");
|
|
throw new BizException("课程已结算,无法清除考勤");
|
|
@@ -5293,7 +5294,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
if(schedule == null){
|
|
if(schedule == null){
|
|
throw new BizException("课程不存在");
|
|
throw new BizException("课程不存在");
|
|
}
|
|
}
|
|
- LOGGER.warn("teacherCourseRates courseScheduleId:{},userId{}",courseScheduleId,user.getId());
|
|
|
|
|
|
+ businessLogger.info("teacherCourseRates courseScheduleId:{},userId{}",courseScheduleId,user.getId());
|
|
//如果是乐团课
|
|
//如果是乐团课
|
|
List<CourseScheduleRateDto> courseScheduleRateDtos;
|
|
List<CourseScheduleRateDto> courseScheduleRateDtos;
|
|
CourseSchedule courseSchedule;
|
|
CourseSchedule courseSchedule;
|