1、陪练课调整

2、付费陪练课可预约时间调整

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

@@ -5,11 +5,9 @@ import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
-
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Set;
 
 public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeacherMapper> {
 
@@ -60,6 +58,9 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
 
     List<ClassGroupTeacherMapper> findByClassGroup(Integer classGroupId);
 
+    ClassGroupTeacherMapper findByClassGroupAndTeacher(@Param("classGroupId") Integer classGroupId,
+                                                       @Param("userId") Integer userId);
+
     /**
      * 批量查询班级的老师关联关系
      *

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

@@ -27,6 +27,7 @@ import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -1685,6 +1686,17 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("请设置默认课酬");
 			}
 
+			ClassGroupTeacherMapper oldClassGroupTeacherMapper = classGroupTeacherMapperDao.findByClassGroupAndTeacher(classGroup.getId(),oldTeacherId);
+			if(Objects.nonNull(oldClassGroupTeacherMapper)){
+				ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();
+				BeanUtils.copyProperties(oldClassGroupTeacherMapper,classGroupTeacherMapper);
+				classGroupTeacherMapper.setUserId(vipGroup.getUserId());
+				classGroupTeacherMapper.setCreateTime(now);
+				classGroupTeacherMapper.setUpdateTime(now);
+				classGroupTeacherMapperDao.delete(oldClassGroupTeacherMapper.getId());
+				classGroupTeacherMapperDao.insert(classGroupTeacherMapper);
+			}
+
 			//创建老师单节课课酬信息
 			courseScheduleTeacherSalaryService.createCourseScheduleTeacherVipSalary(vipGroup,
 					newCourseSchedules,

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

@@ -162,6 +162,9 @@
     <select id="findByClassGroup" resultMap="ClassGroupTeacherMapper">
         SELECT * FROM class_group_teacher_mapper WHERE class_group_id_=#{classGroupId}
     </select>
+    <select id="findByClassGroupAndTeacher" resultMap="ClassGroupTeacherMapper">
+        SELECT * FROM class_group_teacher_mapper WHERE class_group_id_=#{classGroupId} AND user_id_=#{userId}
+    </select>
     <select id="findByClassGroupIds" resultMap="ClassGroupTeacherMapDto">
         SELECT
             cgtm.*,