Fdily/roll-room
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
Fdily
2026-05-05 10:21:27 +08:00
parent 8a48e474a1
commit 262bba0fe9
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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