Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/mapper/FsCourseAnswerLogsMapper.java

@@ -120,7 +120,6 @@ public interface FsCourseAnswerLogsMapper
             "</script>"})
     int selectErrorCountByCourseVideo(@Param("videoId") Long videoId,@Param("userId") Long userId,@Param("qwUserId") String qwUserId);
 
-    @Select("select count(log_id) from fs_course_red_packet_log where user_id = #{userId} and video_id = #{videoId} and period_id = #{periodId}")
     Long selectRedStatus(@Param("userId") Long userId, @Param("videoId") Long videoId, @Param("periodId") Long periodId);
 
     List<FsCourseAnswerLogsListVO> selectFsCourseAnswerLogsListVONew(FsCourseAnswerLogsParam param);

fs-service/src/main/resources/mapper/course/FsCourseAnswerLogsMapper.xml

@@ -196,5 +196,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         ) AS paged_ids ON cal.log_id = paged_ids.log_id
     </select>
+    
+    <select id="selectRedStatus" resultType="java.lang.Long">
+        select count(log_id)
+        from fs_course_red_packet_log
+        where user_id = #{userId} and video_id = #{videoId}
+        <if test="periodId != null">
+            and period_id = #{periodId}
+        </if>
+    </select>
 
 </mapper>