diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java index 5fc1a065..fcb99135 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseDetailsServiceImpl.java @@ -171,6 +171,13 @@ public class CourseDetailsServiceImpl extends ServiceImpl 3 && (CollectionUtil.isEmpty(finalDetailsId) || !finalDetailsId.contains(s.getCourseDetailsId())) && courseUser == null) { + if (!freeWatch && s.getSort() > 3 && (CollectionUtil.isEmpty(finalDetailsId) || !finalDetailsId.contains(s.getCourseDetailsId())) && courseUser == null && !isVip) { s.setVideoUrl(null); } if (s.getSort() > finalStartSort && s.getSort() < finalEndSort) { @@ -239,7 +246,7 @@ public class CourseDetailsServiceImpl extends ServiceImpl(page, limit), new QueryWrapper<>(taskCenterReward).orderByDesc("id"))); + PageHelper.startPage(page == null ? 0 : page, limit == null ? 10 : limit); + List list = taskCenterRewardService.list(new QueryWrapper<>(taskCenterReward).orderByDesc("id")); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo, true)); } @Login @@ -106,7 +111,7 @@ public class TaskCenterRewardController { } } map.put("receive", record.getSourceId()); - map.put("record", record.getId()); + map.put("record", record.getId()+""); } map.put("data", list); return Result.success(map); diff --git a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java index c6bff50a..592fb8ca 100644 --- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java +++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java @@ -29,7 +29,7 @@ public class TaskCenterReward extends Model { private String img; @ApiModelProperty("奖励名称") private String name; - @ApiModelProperty("奖励类型 1 金币 2 现金红包 3 4 5 9 大转盘抽奖次数") + @ApiModelProperty("奖励类型 1 金币 2 现金红包 3实物 4 5 9 大转盘抽奖次数") private Integer type; @TableField(exist = false) @JsonSerialize(using = ToStringSerializer.class)