Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_qrLogin

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

@@ -5424,6 +5424,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			courseSchedule.setNote("课程合并");
 			courseSchedule.setMergeFlag(2);
 			courseSchedule.setMergeTime(now);
+			courseSchedule.setNewCourseId(courseMergeInfo.getId());
 		}
 		List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseScheduleIds(allCourseIds);
 
@@ -5453,6 +5454,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<CourseSchedule> courseSchedules=new ArrayList<>();
 		courseMergeInfo.setNewCourseId(courseMergeInfo.getId());
 		courseMergeInfo.setMergeFlag(1);
+		courseMergeInfo.setMergeTime(now);
 		courseSchedules.add(courseMergeInfo);
 		List<CourseScheduleModifyLog> insertCourseScheduleModifyLogList = new ArrayList<>();
 
@@ -5463,10 +5465,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			courseScheduleModifyLog.setCourseScheduleId(courseSchedule.getId());
 			courseScheduleModifyLog.setCreateTime(now);
 			courseScheduleModifyLog.setPreviousCourseSchedule(JsonUtil.toJSONString(courseSchedule));
-
-			//课程信息变更
-			courseSchedule.setNewCourseId(courseMergeInfo.getId());
-			courseSchedule.setMergeTime(now);
 			courseScheduleModifyLog.setCurrentCourseSchedule(JsonUtil.toJSONString(courseSchedule));
 			courseScheduleModifyLog.setOperatorId(courseMergeInfo.getOperatorId());
 			insertCourseScheduleModifyLogList.add(courseScheduleModifyLog);

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

@@ -3326,7 +3326,7 @@
     </update>
 
     <update id="cleanCoursMergeId">
-        UPDATE course_schedule SET new_course_id_=NULL WHERE id_ IN
+        UPDATE course_schedule SET new_course_id_ = NULL,merge_time_ = NULL WHERE id_ IN
         <foreach collection="courseIds" item="courseId" separator="," open="(" close=")">
             #{courseId}
         </foreach>