Long пре 1 месец
родитељ
комит
e08abe14e8

+ 5 - 8
fs-service-system/src/main/java/com/fs/course/mapper/FsUserCoursePeriodDaysMapper.java

@@ -5,8 +5,7 @@ import com.fs.course.domain.FsUserCoursePeriodDays;
 import com.fs.his.vo.OptionsVO;
 import org.apache.ibatis.annotations.Param;
 
-import java.time.LocalDate;
-import java.time.LocalTime;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -87,15 +86,13 @@ public interface FsUserCoursePeriodDaysMapper extends BaseMapper<FsUserCoursePer
 
     /**
      * 开启课程
-     * @param date  日期
-     * @param time  时间
+     * @param now  时间
      */
-    void startPeriodCourse(@Param("date") LocalDate date, @Param("time") LocalTime time);
+    void startPeriodCourse(@Param("now") LocalDateTime now);
 
     /**
      * 关闭课程
-     * @param date  日期
-     * @param time  时间
+     * @param now  时间
      */
-    void endPeriodCourse(@Param("date") LocalDate date, @Param("time") LocalTime time);
+    void endPeriodCourse(@Param("now") LocalDateTime now);
 }

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

@@ -30,7 +30,6 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -303,10 +302,10 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
     @Override
     public void changePeriodCourseStatus() {
         // 开启
-        fsUserCoursePeriodDaysMapper.startPeriodCourse(LocalDate.now(), LocalTime.now());
+        fsUserCoursePeriodDaysMapper.startPeriodCourse(LocalDateTime.now());
 
         // 关闭
-        fsUserCoursePeriodDaysMapper.endPeriodCourse(LocalDate.now(), LocalTime.now());
+        fsUserCoursePeriodDaysMapper.endPeriodCourse(LocalDateTime.now());
     }
 
     private static FsCourseAnalysisCountVO getCourseAnalysisCountVO(FsUserCoursePeriodDays v, Map<Long, FsCourseAnalysisCountVO> courseMap, Map<Long, FsCourseAnalysisCountVO> redPacketMap, Map<Long, FsCourseAnalysisCountVO> answerMap) {

+ 4 - 6
fs-service-system/src/main/resources/mapper/course/FsUserCoursePeriodDaysMapper.xml

@@ -160,17 +160,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="startPeriodCourse">
         update fs_user_course_period_days ucpd
-        left join fs_user_course_period ucp on ucp.period_id = ucpd.period_id
-        set ucpd.status = 1, ucpd.update_time = now()
-        where ucpd.status = 0 and ucpd.day_date = #{date} and ucp.view_start_time >= #{time}
+        set ucpd.status = 1, ucpd.update_time = #{now}
+        where ucpd.status = 0 and ucpd.start_date_time >= #{now}
     </update>
 
     <update id="endPeriodCourse">
         update fs_user_course_period_days ucpd
-        left join fs_user_course_period ucp on ucp.period_id = ucpd.period_id
-        set ucpd.status = 2, ucpd.update_time = now()
+        set ucpd.status = 2, ucpd.update_time = #{now}
         <![CDATA[
-        where ucpd.status = 1 and (ucpd.day_date > #{date} or ucp.view_end_time < #{time})
+        where ucpd.status = 1 and ucpd.end_date_time < #{now}
         ]]>
     </update>
 </mapper>