直播分页/核销记录

fs-common/src/main/java/com/fs/common/core/page/PageRequest.java

@@ -12,7 +12,7 @@ public class PageRequest {
     /**
      * 当前页
      */
-    private int currentPage = 1;
+    private int pageNum = 1;
     /**
      * 每页结果数
      */

fs-service/src/main/java/com/fs/live/service/impl/LiveServiceImpl.java

@@ -862,8 +862,8 @@ public class LiveServiceImpl implements ILiveService
 
     @Override
     public R liveListAll(PageRequest pageRequest) {
-        int start = (pageRequest.getCurrentPage() - 1) * pageRequest.getPageSize();
-        int end = pageRequest.getCurrentPage() * pageRequest.getPageSize() - 1;
+        int start = (pageRequest.getPageNum() - 1) * pageRequest.getPageSize();
+        int end = pageRequest.getPageNum() * pageRequest.getPageSize() - 1;
         List<Live> lives = baseMapper.liveListAll();
 
         // 对结果进行分页处理

fs-user-app/src/main/java/com/fs/app/controller/cacheLive/CacheLiveController.java

@@ -124,8 +124,8 @@ public class CacheLiveController extends CacheLiveBaseController {
     @GetMapping("/liveList")
     @ApiResponse(code = 200, message = "", response = LiveInfoVo.class)
     public R liveList(PageRequest pageRequest) {
-        int start = (pageRequest.getCurrentPage() - 1) * pageRequest.getPageSize();
-        int end = pageRequest.getCurrentPage() * pageRequest.getPageSize() - 1;
+        int start = (pageRequest.getPageNum() - 1) * pageRequest.getPageSize();
+        int end = pageRequest.getPageNum() * pageRequest.getPageSize() - 1;
 
         Set<Object> liveList = redisCache.zSetReverseRange(LiveKeysConstant.LIVE_HOME_PAGE_LIST, start, end);
         if (CollUtil.isNotEmpty(liveList)) {

fs-user-app/src/main/java/com/fs/app/facade/impl/LiveFacadeServiceImpl.java

@@ -53,14 +53,14 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
 
     @Autowired
     private ILiveLotteryConfService liveLotteryConfService;
-    
+
     @Autowired
     private ILiveCompletionPointsRecordService completionPointsRecordService;
 
     @Override
     public R liveList(PageRequest pageRequest) {
-        int start = (pageRequest.getCurrentPage() - 1) * pageRequest.getPageSize();
-        int end = pageRequest.getCurrentPage() * pageRequest.getPageSize() - 1;
+        int start = (pageRequest.getPageNum() - 1) * pageRequest.getPageSize();
+        int end = pageRequest.getPageNum() * pageRequest.getPageSize() - 1;
 
         List<Live> lives = null;
         // 查询缓存中的直播列表数据
@@ -133,32 +133,32 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
         if(liveVo.getIsShow() == 2) {
             return R.error("直播未开放");
         }
-        
+
         // 查询用户今天是否已领取完课奖励
         if (userId != null) {
             try {
-                List<LiveCompletionPointsRecord> unreceivedRecords = 
+                List<LiveCompletionPointsRecord> unreceivedRecords =
                     completionPointsRecordService.getUserUnreceivedRecords(id, userId);
-                
+
                 // 判断是否有未领取的奖励，如果有则说明今天还未领取
                 // 如果没有未领取的，再查询是否有已领取的记录
                 if (unreceivedRecords != null && !unreceivedRecords.isEmpty()) {
                     liveVo.setTodayRewardReceived(false);
                 } else {
                     // 查询所有记录（包括已领取和未领取）
-                    List<LiveCompletionPointsRecord> allRecords = 
+                    List<LiveCompletionPointsRecord> allRecords =
                         completionPointsRecordService.getUserRecords(id, userId);
-                    
+
                     if (allRecords != null && !allRecords.isEmpty()) {
                         // 检查最近一条记录是否是今天的且已领取
                         LiveCompletionPointsRecord latestRecord = allRecords.get(0);
                         Date today = new Date();
                         Date recordDate = latestRecord.getCurrentCompletionDate();
-                        
+
                         // 判断是否为同一天
-                        boolean isSameDay = recordDate != null && 
+                        boolean isSameDay = recordDate != null &&
                             isSameDay(recordDate, today);
-                        
+
                         if (isSameDay && latestRecord.getReceiveStatus() == 1) {
                             liveVo.setTodayRewardReceived(true);
                         } else {
@@ -175,13 +175,13 @@ public class LiveFacadeServiceImpl extends BaseController implements LiveFacadeS
         } else {
             liveVo.setTodayRewardReceived(false);
         }
-        
+
         return R.ok().put("serviceTime", System.currentTimeMillis())
                 .put("serviceStartTime", liveVo.getStartTime() == null ? null : liveVo.getStartTime().atZone(ZONE_ID).toInstant().toEpochMilli())
                 .put("serviceEndTime", liveVo.getFinishTime() == null ? null : liveVo.getFinishTime().atZone(ZONE_ID).toInstant().toEpochMilli())
                 .put("data", liveVo);
     }
-    
+
     /**
      * 判断两个日期是否为同一天
      */