|
@ -194,7 +194,7 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe |
|
|
// List<User> supplementWinners = randomSelectUsers(allAvailableUsers, Math.min(remaining, allAvailableUsers.size())); |
|
|
// List<User> supplementWinners = randomSelectUsers(allAvailableUsers, Math.min(remaining, allAvailableUsers.size())); |
|
|
// winners.addAll(convertToUserVoList(supplementWinners)); |
|
|
// winners.addAll(convertToUserVoList(supplementWinners)); |
|
|
// markUsersAsWinners(supplementWinners, startLotteryDto); |
|
|
// markUsersAsWinners(supplementWinners, startLotteryDto); |
|
|
// } |
|
|
|
|
|
|
|
|
// } requir |
|
|
if (winners.size() < requiredWinners) { |
|
|
if (winners.size() < requiredWinners) { |
|
|
int remaining = requiredWinners - winners.size(); |
|
|
int remaining = requiredWinners - winners.size(); |
|
|
List<User> allAvailableUsers = getAllAvailableUsers(startLotteryDto.getGradeId()); |
|
|
List<User> allAvailableUsers = getAllAvailableUsers(startLotteryDto.getGradeId()); |
|
@ -398,13 +398,13 @@ public class UserDetailServiceImpl extends ServiceImpl<IUserDetailMapper, UserDe |
|
|
|
|
|
|
|
|
// 4. 如果不存在任何记录,则插入新记录 |
|
|
// 4. 如果不存在任何记录,则插入新记录 |
|
|
|
|
|
|
|
|
String cnName = fundingMapper.updateLocMarketToCn(user.getLocMarket()); |
|
|
|
|
|
|
|
|
// String cnName = fundingMapper.updateLocMarketToCn(user.getLocMarket()); |
|
|
WinnerRecord winnerRecord = WinnerRecord.builder() |
|
|
WinnerRecord winnerRecord = WinnerRecord.builder() |
|
|
.userId(user.getId()) |
|
|
.userId(user.getId()) |
|
|
.winTime(new Date()) |
|
|
.winTime(new Date()) |
|
|
.prizeId(startLotteryDto.getPrizeId()) |
|
|
.prizeId(startLotteryDto.getPrizeId()) |
|
|
.isDel(0) // 明确设置为未删除 |
|
|
.isDel(0) // 明确设置为未删除 |
|
|
.locMarket(cnName) |
|
|
|
|
|
|
|
|
.locMarket(user.getLocMarket()) |
|
|
.build(); |
|
|
.build(); |
|
|
adminWinMapper.insert(winnerRecord); |
|
|
adminWinMapper.insert(winnerRecord); |
|
|
} |
|
|
} |
|
|