Merge remote-tracking branch 'origin/master'

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

@@ -3192,22 +3192,19 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             newTeacherIdList.addAll(newCourseSchedule.getTeachingTeacherIdList());
             newTeacherIdList.add(newCourseSchedule.getActualTeacherId());
 
-			if (newCourseSchedule.getStatus() != CourseStatusEnum.OVER) {
-				// 清理原来考勤
-				teacherAttendanceDao.deletebyCourseScheduleId(courseScheduleId);
-
-				// 新增考勤
-				for (Integer teacherId : newTeacherIdList) {
-					TeacherAttendance ta = new TeacherAttendance();
-					ta.setClassGroupId(newCourseSchedule.getClassGroupId());
-					ta.setCourseScheduleId(courseScheduleId);
-					ta.setCreateTime(date);
-					ta.setGroupType(newCourseSchedule.getGroupType());
-					ta.setMusicGroupId(newCourseSchedule.getMusicGroupId());
-					ta.setTeacherId(teacherId);
-					insertTeacherAttendanceList.add(ta);
-				}
-				
+			// 清理原来考勤
+			teacherAttendanceDao.deletebyCourseScheduleId(courseScheduleId);
+
+			// 新增考勤
+			for (Integer teacherId : newTeacherIdList) {
+				TeacherAttendance ta = new TeacherAttendance();
+				ta.setClassGroupId(newCourseSchedule.getClassGroupId());
+				ta.setCourseScheduleId(courseScheduleId);
+				ta.setCreateTime(date);
+				ta.setGroupType(newCourseSchedule.getGroupType());
+				ta.setMusicGroupId(newCourseSchedule.getMusicGroupId());
+				ta.setTeacherId(teacherId);
+				insertTeacherAttendanceList.add(ta);
 			}
 
 			if(newCourseSchedule.getStatus() == CourseStatusEnum.NOT_START && newCourseSchedule.getGroupType() == GroupType.MUSIC){

mec-student/src/main/java/com/ym/mec/student/config/WebMvcConfig.java

@@ -46,7 +46,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
 		registry.addInterceptor(mdcInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
 
-		registry.addInterceptor(operationLogInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
+//		registry.addInterceptor(operationLogInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
 	}
 
 	@Bean

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -143,6 +143,7 @@ public class StudentOrderController extends BaseController {
             orderDetail.put("course", musicGroup.getCourseForm());
             orderDetail.put("ownershipType", musicGroup.getOwnershipType());
             orderDetail.put("detailType", orderDetailType);
+            orderDetail.put("chargeTypeId", musicGroup.getChargeTypeId());
         } else if (orderByOrderNo.getGroupType().equals(GroupType.VIP)) {
             VipBuyResultDto vipBuyResultInfo = vipGroupService.findVipBuyResultInfo(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
             orderDetail.put("detail", vipBuyResultInfo);

mec-teacher/src/main/java/com/ym/mec/teacher/config/WebMvcConfig.java

@@ -61,7 +61,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 		excludePathPatterns.add("/login");
 		registry.addInterceptor(mdcInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
 
-		registry.addInterceptor(operationLogInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
+//		registry.addInterceptor(operationLogInterceptor).addPathPatterns(includePathPatterns).excludePathPatterns(excludePathPatterns);
 	}
 
 	/**