feat：会员营期的课程修改看课时间改成可以选择日期范围

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodDaysServiceImpl.java

@@ -296,9 +296,24 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
     public R updateCourseTime(UpdateCourseTimeVo vo) {
         List<FsUserCoursePeriodDays> list = fsUserCoursePeriodDaysMapper.selectBatchIds(vo.getIds());
         list.forEach(day -> {
-            day.setStartDateTime(LocalDateTime.of(day.getDayDate(), vo.getStartTime()));
-            day.setEndDateTime(LocalDateTime.of(day.getDayDate(), vo.getEndTime1()));
-            day.setLastJoinTime(LocalDateTime.of(day.getDayDate(), vo.getJoinTime()));
+//            day.setStartDateTime(LocalDateTime.of(day.getDayDate(), vo.getStartTime()));
+//            day.setEndDateTime(LocalDateTime.of(day.getDayDate(), vo.getEndTime1()));
+//            day.setLastJoinTime(LocalDateTime.of(day.getDayDate(), vo.getJoinTime()));
+            // 调整时间为直接接收前端传入的年月日，不使用营期的日期（2025年6月11日 10点41分）
+            day.setStartDateTime(vo.getStartTime());
+            day.setEndDateTime(vo.getEndTime1());
+            day.setLastJoinTime(vo.getJoinTime());
+            // 把营期时间改成开始时间
+            day.setDayDate(vo.getStartTime().toLocalDate());
+            // 设置状态
+            LocalDateTime compareDayTime = LocalDateTime.now();
+            if(compareDayTime.isAfter(day.getStartDateTime()) && compareDayTime.isBefore(day.getEndDateTime())){
+                day.setStatus(1);
+            } else if(compareDayTime.isBefore(day.getStartDateTime())){
+                day.setStatus(0);
+            } else {
+                day.setStatus(2);
+            }
             fsUserCoursePeriodDaysMapper.updateById(day);
         });
         return R.ok();

fs-service-system/src/main/java/com/fs/course/vo/UpdateCourseTimeVo.java

@@ -1,9 +1,11 @@
 package com.fs.course.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.List;
 
@@ -12,8 +14,11 @@ public class UpdateCourseTimeVo {
 
     private List<Long> ids;
     private Long id;
-    private LocalTime startTime;
-    private LocalTime endTime1;
-    private LocalTime joinTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime1;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime joinTime;
     private LocalDate dayDate;
 }