Browse Source

feat:没有设置红包的视频不用中间提示

caoliqin 1 week ago
parent
commit
8e7cce4a2b

+ 0 - 1
fs-service-system/src/main/java/com/fs/course/mapper/FsUserCourseVideoRedPackageMapper.java

@@ -68,7 +68,6 @@ public interface FsUserCourseVideoRedPackageMapper
             "ON DUPLICATE KEY UPDATE red_packet_money = VALUES(red_packet_money);")
     void insertOrUpdateFsUserCourseVideoRedPackage(FsUserCourseVideoParam fsUserCourseVideo);
 
-    @Select("select * from fs_user_course_video_red_package where video_id =#{videoId} and company_id = #{companyId} and period_id = #{periodId}")
     FsUserCourseVideoRedPackage selectRedPacketByCompanyId(@Param("videoId") Long videoId,@Param("companyId") Long companyId, @Param("periodId") Long periodId);
 
     int batchSaveFsUserCourseVideoRedPackage(@Param("list") List<FsUserCourseVideoRedPackage> redPackageList);

+ 6 - 2
fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -1140,8 +1140,12 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         }
 //
         if (courseVideoDetails != null && courseVideoDetails.getDuration() != null){
-            tipsTime = courseVideoDetails.getDuration() / 3;
-            tipsTime2 = (courseVideoDetails.getDuration() * 2) / 3;
+            // 查询视频是否设置了红包,没有就不提示
+            FsUserCourseVideoRedPackage fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyId(param.getVideoId(), null, param.getPeriodId());
+            if(fsUserCourseVideoRedPackage != null){
+                tipsTime = courseVideoDetails.getDuration() / 3;
+                tipsTime2 = (courseVideoDetails.getDuration() * 2) / 3;
+            }
         }
         vo.setTipsTime(tipsTime);
         vo.setTipsTime2(tipsTime2);

+ 10 - 0
fs-service-system/src/main/resources/mapper/course/FsUserCourseVideoRedPackageMapper.xml

@@ -139,4 +139,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectByRuleIds" resultType="com.fs.course.domain.FsUserCourseVideoRedPackage">
         select * from fs_user_course_video_red_package where del_flag ='0' and data_type = 3 and rule_id in <foreach collection="ruleIds" open="(" separator="," close=")" item="item">#{item}</foreach>
     </select>
+
+    <select id="selectRedPacketByCompanyId" resultType="com.fs.course.domain.FsUserCourseVideoRedPackage">
+        select * from fs_user_course_video_red_package
+        <where>
+        <if test="videoId != null "> and video_id =#{videoId}</if>
+        <if test="companyId != null "> and company_id = #{companyId}</if>
+        <if test="periodId != null "> and period_id = #{periodId}</if>
+        </where>
+    </select>
+
 </mapper>