会员营期-未开始和已结束的都可以删除

fs-service/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodServiceImpl.java

@@ -167,7 +167,7 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
             coursePeriodDays.setStartDateTime(startDateTime);
             coursePeriodDays.setEndDateTime(endDateTime);
             coursePeriodDays.setLastJoinTime(lastJsonTime);
-            
+
             // 根据调整后的时间重新计算课程状态（仅对非自由模式营期）
             if (fsUserCoursePeriod.getFreeMode() == null || fsUserCoursePeriod.getFreeMode() != 1) {
                 if (now.isBefore(startDateTime)) {
@@ -181,7 +181,7 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
                     coursePeriodDays.setStatus(1);
                 }
             }
-            
+
             fsUserCoursePeriodDaysMapper.updateFsUserCoursePeriodDays(coursePeriodDays); // 更新数据库中的课程日期
         }
 
@@ -198,7 +198,7 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
     public int deleteFsUserCoursePeriodByIds(Long[] periodIds)
     {
         if (checkPeriodStatus(periodIds)) {
-            throw new ServiceException("存在进行中或已结束的营期，不允许删除");
+            throw new ServiceException("存在进行中的营期，不允许删除");
         }
         int flag = fsUserCoursePeriodMapper.updateBatchDelFlag(periodIds,1);
         //删除课程
@@ -219,18 +219,13 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
         return flag;
     }
     private boolean checkPeriodStatus(Long[] ids) {
-        LocalDate currentDate = LocalDate.now(); // 2025-06-30
         Set<Long> idSet = Arrays.stream(ids).collect(Collectors.toSet());
         List<FsUserCoursePeriod> list = fsUserCoursePeriodMapper.selectFsUserCoursePeriodsByIds(idSet);
 
         List<FsUserCoursePeriod> filteredList = list.stream()
                 .filter(period -> {
-                    LocalDate startTime = period.getPeriodStartingTime();
-                    LocalDate endTime = period.getPeriodEndTime();
-
-                    boolean isActive = startTime != null && !startTime.isAfter(currentDate)
-                            && endTime != null && !endTime.isBefore(currentDate) && Long.valueOf(3).equals(period.getPeriodStatus());
-                    return !isActive;
+                    boolean isActive = Long.valueOf(2).equals(period.getPeriodStatus());
+                    return isActive;
                 })
                 .collect(Collectors.toList());