提交

skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollServiceImpl.java

@@ -652,6 +652,7 @@ public class TtRollServiceImpl extends ServiceImpl<TtRollMapper, TtRoll> impleme
                         .userName(player.getUserName())
                         .nickName(player.getNickName())
                         .avatar(player.getAvatar())
+                        .status("0")
                         .joinTime(DateUtils.getNowDate())
                         .build();
 

skins-service/service-playingmethod/src/main/java/com/ruoyi/playingmethod/service/impl/ApiRollServiceImpl.java

@@ -251,6 +251,7 @@ public class ApiRollServiceImpl extends ServiceImpl<TtRollMapper, TtRoll> implem
                         .userName(player.getUserName())
                         .nickName(player.getNickName())
                         .avatar(player.getAvatar())
+                        .status("0")
                         .joinTime(DateUtils.getNowDate())
                         .build();
 
@@ -320,11 +321,11 @@ public class ApiRollServiceImpl extends ServiceImpl<TtRollMapper, TtRoll> implem
 
         Map<Long, TtRollJackpotOrnaments> surplusPrize = rollSurplusOrnaments(rollUsers, ttRoll);
 
-        // 3 过滤出未分配奖品的用户
+        // 3 过滤出未分配奖品的用户（兼容 status 为 NULL 的历史数据）
         LambdaQueryWrapper<TtRollUser> rollUserQuery = new LambdaQueryWrapper<>();
         rollUserQuery
                 .eq(TtRollUser::getRollId, rollId)
-                .eq(TtRollUser::getStatus, "0");
+                .and(q -> q.eq(TtRollUser::getStatus, "0").or().isNull(TtRollUser::getStatus));
         if (!rollUsers.isEmpty()) {
             List<Integer> rollUserIds = rollUsers.stream()
                     .map(TtRollUser::getId)
@@ -356,6 +357,7 @@ public class ApiRollServiceImpl extends ServiceImpl<TtRollMapper, TtRoll> implem
 
                 // 等级信息
                 TtOrnamentsLevel level = ttOrnamentsLevelService.getById(entry.getValue().getOrnamentLevelId());
+                String levelImg = level != null ? level.getLevelImg() : "";
 
                 TtBoxRecords boxRecords = TtBoxRecords.builder()
                         .rollId(rollId)
@@ -365,7 +367,7 @@ public class ApiRollServiceImpl extends ServiceImpl<TtRollMapper, TtRoll> implem
                         .ornamentsPrice(entry.getValue().getPrice())
                         .imageUrl(entry.getValue().getImgUrl())
                         .ornamentName(entry.getValue().getOrnamentName())
-                        .ornamentLevelImg(level.getLevelImg())
+                        .ornamentLevelImg(levelImg)
                         .source(TtboxRecordSource.ROLL.getCode())
                         .userId(rollUser.getUserId())
                         .updateTime(new Timestamp(System.currentTimeMillis()))