company-app红包领取状态枚举逻辑修改

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

@@ -170,7 +170,6 @@ public class FsUserCourseVideoController extends AppBaseController {
         } else {
             params.put("companyUserId", companyUser.getUserId());
         }
-
         PageHelper.startPage(pageNum, pageSize);
         List<FsUserCourseParticipationRecordVO> record = fsUserCourseService.getParticipationRecordByMap(params);
         return ResponseResult.ok(new PageInfo<>(record));

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

@@ -131,7 +131,7 @@ public interface FsCourseAnswerLogsMapper
     int selectErrorCountByCourseVideo(@Param("videoId") Long videoId, @Param("userId") Long userId, @Param("qwUserId") String qwUserId,@Param("project") Long project);
 
     Long selectRedStatus(@Param("userId") Long userId, @Param("videoId") Long videoId, @Param("periodId") Long periodId);
-
+    Integer selectRedStatus2(@Param("userId") Long userId, @Param("videoId") Long videoId, @Param("periodId") Long periodId);
     List<FsCourseAnswerLogsListVO> selectFsCourseAnswerLogsListVONew(FsCourseAnswerLogsParam param);
 
     Long selectFsCourseAnswerLogsListVONewCount(FsCourseAnswerLogsParam param);

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

@@ -556,14 +556,20 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
             Long lxDay = fsCourseWatchLogMapper.selectByWatchlxDay(recordVO.getUserId(),recordVO.getProjectId());
             System.out.println("进入了连续观看天数："+lxDay+"天");
             recordVO.setWatchLxCount(lxDay);
-
+            //中康小程序统计发送红包状态问题（未答题、未领取、发送成功->0 未领取  1  发送成功  2.没有就是未答题
             // 领取状态
-            Long count = fsCourseAnswerLogsMapper.selectRedStatus(recordVO.getUserId(), recordVO.getVideoId(), (Long) params.get("periodId"));
+            Integer status = fsCourseAnswerLogsMapper.selectRedStatus2(recordVO.getUserId(), recordVO.getVideoId(), (Long) params.get("periodId"));
+            if (status==null){
+                recordVO.setRedStatus(2);
+            }else{
+                recordVO.setRedStatus(status);
+            }
+/*
             if (Objects.nonNull(count) && count > 0) {
                 recordVO.setRedStatus(1);
             } else {
                 recordVO.setRedStatus(0);
-            }
+            }*/
         });
         return list;
     }

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

@@ -196,7 +196,7 @@ 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
@@ -205,5 +205,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and period_id = #{periodId}
         </if>
     </select>
+    <select id="selectRedStatus2" resultType="java.lang.Integer">
+        select `status`
+        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>