Merge branch 'online1' into cloud_teacher_plus_feature

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

@@ -722,6 +722,9 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 		if(statusCoursesMap.containsKey(CourseStatusEnum.NOT_START)){
 			List<CourseScheduleStudentPaymentDto> notStartCourses = statusCoursesMap.get(CourseStatusEnum.NOT_START);
 			for (CourseScheduleStudentPaymentDto notStartCourse : notStartCourses) {
+				if(Objects.isNull(notStartCourse.getActualPrice())){
+					continue;
+				}
 				studentRegistrationService.updateUserSurplusCourseFee(notStartCourse.getUserId(), notStartCourse.getMusicGroupId(), notStartCourse.getActualPrice(), StringUtils.join("课程状态变更到未开始，退还缴费：", notStartCourse.getCourseScheduleId()), null);
 				notStartCourse.setActualPrice(BigDecimal.ZERO);
 				needUpdates.add(notStartCourse);

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

@@ -10,6 +10,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
 import com.ym.mec.biz.dal.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -68,6 +69,8 @@ import com.ym.mec.util.date.DateUtil;
 @Service
 public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentAttendance> implements StudentAttendanceService {
 
+    private final Logger LOGGER = LoggerFactory.getLogger(StudentAttendanceServiceImpl.class);
+
     @Autowired
     private StudentAttendanceDao studentAttendanceDao;
     @Autowired
@@ -113,6 +116,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public Map<String, Object> addStudentAttendances(StudentAttendanceDto studentAttendanceInfos) {
+        LOGGER.info(JSON.toJSONString(studentAttendanceInfos));
         List<StudentAttendance> studentAttendances = studentAttendanceInfos.getStudentAttendances();
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (Objects.isNull(sysUser)) {