From 262bba0fe995f9573326231d5040321fdb305daa Mon Sep 17 00:00:00 2001 From: Fdily <2949549024@qq.com> Date: Tue, 5 May 2026 10:21:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/admin/service/impl/TtRollServiceImpl.java | 1 + .../playingmethod/service/impl/ApiRollServiceImpl.java | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollServiceImpl.java b/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollServiceImpl.java index 3561f49..3b4d288 100644 --- a/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollServiceImpl.java +++ b/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollServiceImpl.java @@ -652,6 +652,7 @@ public class TtRollServiceImpl extends ServiceImpl impleme .userName(player.getUserName()) .nickName(player.getNickName()) .avatar(player.getAvatar()) + .status("0") .joinTime(DateUtils.getNowDate()) .build(); diff --git a/skins-service/service-playingmethod/src/main/java/com/ruoyi/playingmethod/service/impl/ApiRollServiceImpl.java b/skins-service/service-playingmethod/src/main/java/com/ruoyi/playingmethod/service/impl/ApiRollServiceImpl.java index f338790..7ac0d03 100644 --- a/skins-service/service-playingmethod/src/main/java/com/ruoyi/playingmethod/service/impl/ApiRollServiceImpl.java +++ b/skins-service/service-playingmethod/src/main/java/com/ruoyi/playingmethod/service/impl/ApiRollServiceImpl.java @@ -251,6 +251,7 @@ public class ApiRollServiceImpl extends ServiceImpl 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 implem Map surplusPrize = rollSurplusOrnaments(rollUsers, ttRoll); - // 3 过滤出未分配奖品的用户 + // 3 过滤出未分配奖品的用户（兼容 status 为 NULL 的历史数据） LambdaQueryWrapper 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 rollUserIds = rollUsers.stream() .map(TtRollUser::getId) @@ -356,6 +357,7 @@ public class ApiRollServiceImpl extends ServiceImpl 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 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()))