Просмотр исходного кода

会员营期-结束营期之后可以删除营期

luolinsong 1 месяц назад
Родитель
Сommit
624d63d81e

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

@@ -213,9 +213,8 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
                     LocalDate endTime = period.getPeriodEndTime();
 
                     boolean isActive = startTime != null && !startTime.isAfter(currentDate)
-                            && (endTime == null || !endTime.isBefore(currentDate));
-
-                    return isActive;
+                            && endTime != null && !endTime.isBefore(currentDate) && Long.valueOf(3).equals(period.getPeriodStatus());
+                    return !isActive;
                 })
                 .collect(Collectors.toList());
 
@@ -261,6 +260,7 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
         }
 
         fsUserCoursePeriod.setPeriodEndTime(LocalDate.now());
+        fsUserCoursePeriod.setPeriodStatus(Long.valueOf(3));
         fsUserCoursePeriodMapper.updateFsUserCoursePeriod(fsUserCoursePeriod);
 
         // 修改大于当前时间的课程状态