feat: 商品进销存

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

@@ -16,6 +16,7 @@ import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
 import com.ym.mec.biz.dal.page.VipGroupQueryInfo;
 import com.ym.mec.biz.event.source.StudentEventSource;
 import com.ym.mec.biz.service.*;
+import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupMember;
 import com.ym.mec.common.entity.ImGroupModel;
@@ -1750,8 +1751,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                                 ||!preCourseSchedule.getEndClassTime().after(backCourseSchedule.getStartClassTime())) {
                             continue;
                         }
-                        if (!checkExistCourseSchedule
-                                && !courseScheduleIdsSet.contains(backCourseSchedule.getId())) {
+                        if (preCourseSchedule.equals(backCourseSchedule)) {
                             continue;
                         }
 
@@ -2218,13 +2218,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         errInfo.append("安排的课程存在冲突,");
         errInfo.append("冲突课程为：");
 
-        if (Objects.isNull(preCourseSchedule.getId()) && Objects.isNull(backCourseSchedule.getId())) {
-            errInfo.setLength(0);
-            errInfo.append("您设置的循环周期存在时间冲突");
-            return errInfo.toString();
-        }
-
-        CourseSchedule courseSchedule = new CourseSchedule();
+        CourseSchedule courseSchedule = null;
         if (Objects.nonNull(preCourseSchedule.getId()) && existCourseScheduleIds.contains(preCourseSchedule.getId())) {
             courseSchedule = preCourseSchedule;
         }
@@ -2232,6 +2226,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             courseSchedule = backCourseSchedule;
         }
 
+		if (Objects.isNull(courseSchedule)) {
+			errInfo.setLength(0);
+			errInfo.append("您设置的循环周期存在时间冲突");
+			return errInfo.toString();
+		}
+
         String groupName = "";
 
         if (Objects.nonNull(courseSchedule.getId())) {