1、会员营期添加设置营期状态、课程状态；2、营期设置看课时间和领取红包截至时间；

fs-company-app/src/main/java/com/fs/app/controller/WxCompanyUserController.java

@@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 import java.util.Objects;
 
-@Api("微信小程序相关接口")
+@Api("微信小程序相关接口（暂废弃，后面再删除）")
 @RestController
 @RequestMapping(value = "/app/wx/miniapp")
 @Slf4j

fs-service-system/src/main/java/com/fs/course/domain/FsUserCoursePeriod.java

@@ -2,6 +2,7 @@ package com.fs.course.domain;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Date;
 import java.util.List;
 
@@ -82,6 +83,18 @@ public class FsUserCoursePeriod
     @Excel(name = "营期状态，1-未开始，2-进行中，3-已结束")
     private Long periodStatus;
 
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "开始看课时间")
+    private LocalTime viewStartTime;
+
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "结束看课时间")
+    private LocalTime viewEndTime;
+
+    @JsonFormat(pattern = "HH:mm:ss")
+    @Excel(name = "领取红包结束时间")
+    private LocalTime lastJoinTime;
+
     @TableField(exist = false)
     private List<Long> companyIdList;
 }

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

@@ -155,6 +155,13 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
             day.setCourseId(entity.getCourseId());
             day.setVideoId(e);
             day.setCreateTime(new Date());
+            // 默认开启今天及以后的两天
+            LocalDate compareDay = LocalDate.now().plusDays(1);
+            if(day.getDayDate().isBefore(compareDay)){
+                day.setStatus(1);
+            } else {
+                day.setStatus(0);
+            }
             return day;
         }).collect(Collectors.toList());
         super.saveBatch(collect);

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

@@ -1,5 +1,6 @@
 package com.fs.course.service.impl;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import com.fs.common.utils.DateUtils;
@@ -56,6 +57,14 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
     public int insertFsUserCoursePeriod(FsUserCoursePeriod fsUserCoursePeriod)
     {
         fsUserCoursePeriod.setCreateTime(LocalDateTime.now());
+        // 设置营期状态
+        if(LocalDate.now().isBefore(fsUserCoursePeriod.getPeriodStartingTime())){
+            fsUserCoursePeriod.setPeriodStatus(1L);
+        } else if(LocalDate.now().isAfter(fsUserCoursePeriod.getPeriodEndTime())){
+            fsUserCoursePeriod.setPeriodStatus(3L);
+        } else{
+            fsUserCoursePeriod.setPeriodStatus(2L);
+        }
         return fsUserCoursePeriodMapper.insertFsUserCoursePeriod(fsUserCoursePeriod);
     }
 

fs-service-system/src/main/resources/mapper/course/FsUserCoursePeriodMapper.xml

@@ -96,6 +96,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodType != null">period_type,</if>
             <if test="periodStartingTime != null">period_starting_time,</if>
             <if test="periodEndTime != null">period_end_time,</if>
+            <if test="viewStartTime != null">view_start_time,</if>
+            <if test="viewEndTime != null">view_end_time,</if>
+            <if test="lastJoinTime != null">last_join_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="periodId != null">#{periodId},</if>
@@ -110,6 +113,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodType != null">#{periodType},</if>
             <if test="periodStartingTime != null">#{periodStartingTime},</if>
             <if test="periodEndTime != null">#{periodEndTime},</if>
+            <if test="viewStartTime != null">#{viewStartTime},</if>
+            <if test="viewEndTime != null">#{viewEndTime},</if>
+            <if test="lastJoinTime != null">#{lastJoinTime},</if>
          </trim>
     </insert>
 
@@ -127,6 +133,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodType != null">period_type = #{periodType},</if>
             <if test="periodStartingTime != null">period_starting_time = #{periodStartingTime},</if>
             <if test="periodEndTime != null">period_end_time = #{periodEndTime},</if>
+            <if test="viewStartTime != null">view_start_time = #{viewStartTime},</if>
+            <if test="viewEndTime != null">view_end_time = #{viewEndTime},</if>
+            <if test="lastJoinTime != null">last_join_time = #{lastJoinTime},</if>
         </trim>
         where period_id = #{periodId}
     </update>