1、课程调整删除被调整的教师的签到记录

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherAttendanceDao.java

@@ -24,6 +24,9 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
 
     int batchDeleteByCourseSchedules(@Param("courseScheduleIds") List<Long> courseScheduleIds);
 
+    int batchDeleteByCourseAndUsers(@Param("courseScheduleId") Integer courseScheduleId,
+                                    @Param("userIds") List<Integer> userIds);
+
     /**
      * 教师个人签到记录统计
      * @param params

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

@@ -847,11 +847,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 			oldCourseSchedule.setActualTeacherId(newCourseSchedule.getActualTeacherId());
 			courseScheduleDao.update(oldCourseSchedule);
-			//删除被修改的教师课酬记录
+			//删除被修改的教师课酬记录和考勤记录
 			if(!CollectionUtils.isEmpty(beReplaceTeacherIds)){
 //				courseScheduleTeacherSalaryDao.batchUpdateTeacherExpectSalary(newCourseSchedule.getId().intValue(),beReplaceTeacherIds);
 				courseScheduleTeacherSalaryDao.batchDeleteByCourseAndTeacher(newCourseSchedule.getId(),beReplaceTeacherIds);
-
+				teacherAttendanceDao.batchDeleteByCourseAndUsers(newCourseSchedule.getId().intValue(),beReplaceTeacherIds);
 			}
 		});
 		//生成修改后的教师课酬

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

@@ -989,7 +989,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 				this.orderCallback(studentPaymentOrder);
 
-				sysUserCashAccountService.updateBalance(user.getId(), amount.negate(),PlatformCashAccountDetailTypeEnum.PAY_FEE,"乐团续费");
+				sysUserCashAccountService.updateBalance(user.getId(), amount.negate(),PlatformCashAccountDetailTypeEnum.PAY_FEE,"VIP课购买");
 
 				Map<String,Object> result=new HashMap<>();
 				result.put("orderNo",studentPaymentOrder.getOrderNo());

mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -116,6 +116,14 @@
         </foreach>
     </delete>
 
+    <delete id="batchDeleteByCourseAndUsers">
+        DELETE FROM teacher_attendance WHERE course_schedule_id_ = #{courseScheduleId}
+        AND teacher_id_ IN
+        <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+            #{userId}
+        </foreach>
+    </delete>
+
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="TeacherAttendance" parameterType="map">
         SELECT * FROM teacher_attendance ORDER BY id_