小修改

lottery-system/lottery-pojo/src/main/java/com/lottery/dto/SimpleQueryDto.java

@@ -0,0 +1,19 @@
+package com.lottery.dto;
+
+import lombok.Data;
+
+/**
+ * @program: lottery
+ * @ClassName SimpleQueryDto
+ * @description:
+ * @author: wwl
+ * @create: 2025-07-24 16:06
+ * @Version 1.0
+ **/
+@Data
+public class SimpleQueryDto {
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+}

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/AdminWinService.java

@@ -28,5 +28,5 @@ public interface AdminWinService extends IService<WinnerRecord> {
 
     void exportWinUser(WinUserQueryDto winUserQueryDto, HttpServletResponse response) throws IOException;
 
-    PageInfo<WinUserVo> listWinUserWin();
+    PageInfo<WinUserVo> listWinUserWin(int pageNum, int pageSize);
 }

lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/AdminWinServiceImpl.java

@@ -183,8 +183,8 @@ public class AdminWinServiceImpl extends ServiceImpl<AdminWinMapper, WinnerRecor
         }
 
     @Override
-    public PageInfo<WinUserVo> listWinUserWin() {
-        return this.listWinUser(1, Integer.MAX_VALUE, new WinUserQueryDto());
+    public PageInfo<WinUserVo> listWinUserWin(int pageNum, int pageSize) {
+        return this.listWinUser(pageNum, pageSize, new WinUserQueryDto());
     }
 
 

lottery-system/lottery-service/src/main/java/com/lottery/api/controller/WinUserController.java

@@ -3,6 +3,8 @@ package com.lottery.api.controller;
 import com.lottery.admin.mapper.AdminUserMapper;
 import com.lottery.admin.service.AdminWinService;
 import com.lottery.api.service.WinUserService;
+import com.lottery.dto.SimpleQueryDto;
+import com.lottery.dto.WinUserQueryDto;
 import com.lottery.result.Result;
 import com.lottery.vo.PageInfo;
 import com.lottery.vo.WinUserVo;
@@ -32,9 +34,15 @@ public class WinUserController {
     private AdminWinService adminWinService;
 
     @PostMapping("/list")
-    public Result<PageInfo<WinUserVo>> list(){
-        LOGGER.info("查询所有中奖用户");
-        return Result.success(adminWinService.listWinUserWin());
+    public Result<PageInfo<WinUserVo>> list(SimpleQueryDto simpleQueryDto){
+        LOGGER.info("分页查询所有中奖用户");
+        if (simpleQueryDto.getPageNum() == null) {
+            simpleQueryDto.setPageNum(1);
+        }
+        if (simpleQueryDto.getPageSize() == null) {
+            simpleQueryDto.setPageSize(10);
+        }
+        return Result.success(adminWinService.listWinUserWin(simpleQueryDto.getPageNum(), simpleQueryDto.getPageSize()));
         //return Result.success();
     }
 }

lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserDetailServiceImpl.java

@@ -2,6 +2,7 @@ package com.lottery.api.service.Impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.lottery.admin.controller.AdminPrizeController;
 import com.lottery.admin.mapper.AdminPrizeMapper;
@@ -186,12 +187,12 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe
             List<User> allAvailableUsers = getAllAvailableUsers(startLotteryDto.getGradeId());
 
             // 再次确保不包含任何内定用户
-            allAvailableUsers = allAvailableUsers.stream()
-                    .filter(user -> {
-                        UserDetail detail = userDetailMapper.selectById(user.getId());
-                        return detail == null || detail.getIsFixed() != 1;
-                    })
-                    .collect(Collectors.toList());
+//            allAvailableUsers = allAvailableUsers.stream()
+//                    .filter(user -> {
+//                        UserDetail detail = userDetailMapper.selectById(user.getId());
+//                        return detail == null || detail.getIsFixed() != 1;
+//                    })
+//                    .collect(Collectors.toList());
 
             List<User> supplementWinners = randomSelectUsers(
                     allAvailableUsers,
@@ -222,7 +223,7 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe
         return lotteryVo;
     }
 
-    // 获取可用的内定用户（未中奖的）
+//     获取可用的内定用户（未中奖的）
     private List<User> getAvailableFixedUsers(List<UserDetail> fixedUsers) {
         List<User> availableUsers = new ArrayList<>();
         for (UserDetail userDetail : fixedUsers) {
@@ -237,6 +238,23 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe
         return availableUsers;
     }
 
+//    private List<User> getAvailableFixedUsers(List<UserDetail> fixedUsers) {
+//        if (CollectionUtils.isEmpty(fixedUsers)) {
+//            return Collections.emptyList();
+//        }
+//
+//        List<Long> userIds = fixedUsers.stream()
+//                .map(UserDetail::getUserId)
+//                .collect(Collectors.toList());
+//
+//        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>()
+//                .in(User::getId, userIds)
+//                .eq(User::getIsDel, 0)
+//                .eq(User::getIsWin, 0);
+//
+//        return userMapper.selectList(wrapper);
+//    }
+
     // 获取所有其他等奖的内定用户（排除当前等级）
     private List<User> getOtherGradeFixedUsers(Long excludeGradeId) {
         LambdaQueryWrapper<UserDetail> wrapper = new LambdaQueryWrapper<>();