无红包课程不展示【提交答案领取奖励】

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -2589,7 +2589,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         if(config.getIsOpenRestReminder()==null || config.getIsOpenRestReminder()==1 ){
             if (courseVideoDetails != null && courseVideoDetails.getDuration() != null){
                 // 查询视频是否设置了红包，没有就不提示
-                FsUserCourseVideoRedPackage fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), null, param.getPeriodId());
+                FsUserCourseVideoRedPackage fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), watchLog == null ? null : watchLog.getCompanyId(), param.getPeriodId());
                 if(fsUserCourseVideoRedPackage != null){
                     tipsTime = courseVideoDetails.getDuration() / 3;
                     tipsTime2 = (courseVideoDetails.getDuration() * 2) / 3;

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

@@ -158,6 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="periodId != null "> and period_id = #{periodId}</if>
         </where>
+        limit 1
     </select>
 
 <!--    <select id="selectRedPacketByCompanyId" resultType="com.fs.course.domain.FsUserCourseVideoRedPackage">-->

fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwController.java

@@ -150,7 +150,7 @@ public class CourseQwController extends AppBaseController {
             long tipsTime = 0L;
             int isFinish = 0;
             int isRedPackage = 0;
-            FsUserCourseVideoRedPackage fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), null, param.getPeriodId());
+            FsUserCourseVideoRedPackage fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), param.getCompanyId(), param.getPeriodId());
             if (fsUserCourseVideoRedPackage != null && fsUserCourseVideoRedPackage.getRedPacketMoney() !=null && BigDecimal.ZERO.compareTo(fsUserCourseVideoRedPackage.getRedPacketMoney()) != 0) {
                 isRedPackage = 1;
             }
@@ -205,7 +205,7 @@ public class CourseQwController extends AppBaseController {
             String redisKey = "h5OpenUser:watch:duration:" + param.getUserId() + ":" + param.getVideoId();
             String durationStr = redisCache.getCacheObject(redisKey);
             FsCourseWatchLog log = courseWatchLogService.getWatchCourseVideoIsOpen(param.getUserId(),param.getVideoId());
-            FsUserCourseVideoRedPackage fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), null, param.getPeriodId());
+            FsUserCourseVideoRedPackage fsUserCourseVideoRedPackage = fsUserCourseVideoRedPackageMapper.selectRedPacketByCompanyCount(param.getVideoId(), param.getCompanyId(), param.getPeriodId());
             if (fsUserCourseVideoRedPackage != null && fsUserCourseVideoRedPackage.getRedPacketMoney() != null && BigDecimal.ZERO.compareTo(fsUserCourseVideoRedPackage.getRedPacketMoney()) != 0) {
                 isRedPackage = 1;
             }