Browse Source

修改地址逻辑

dev
jihaipeng 3 weeks ago
parent
commit
2efab94a0d
  1. 2
      lottery-system/lottery-pojo/src/main/java/com/lottery/dto/PageSimpleDto.java
  2. 4
      lottery-system/lottery-service/src/main/java/com/lottery/admin/service/Impl/FundingServiceImpl.java
  3. 2
      lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/ApiFundingServiceImpl.java
  4. 6
      lottery-system/lottery-service/src/main/java/com/lottery/api/service/Impl/UserDetailServiceImpl.java

2
lottery-system/lottery-pojo/src/main/java/com/lottery/dto/PageSimpleDto.java

@ -15,5 +15,5 @@ public class PageSimpleDto {
private Integer pageNum; private Integer pageNum;
private Integer pageSize;
private Integer pageSize;
} }

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

@ -328,8 +328,8 @@ public class FundingServiceImpl implements IFundingService {
} }
//查询当前的虚拟 //查询当前的虚拟
Integer virtual = fundingMapper.searchVirtual(activityId, stock); Integer virtual = fundingMapper.searchVirtual(activityId, stock);
if(total + addTotal+markerTwoVirtual > 1500){
return Result.failure("所在市场助力值最大1500");
if(total + addTotal+markerTwoVirtual > 4200){
return Result.failure("所在市场助力值最大4200");
} }
if(total + addTotal + markerTwoVirtual< 0){ if(total + addTotal + markerTwoVirtual< 0){

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

@ -196,7 +196,7 @@ public class ApiFundingServiceImpl implements ApiIFundingService {
} }
Integer Show = markerTwoTotal + markerTwoVirtual; Integer Show = markerTwoTotal + markerTwoVirtual;
if((Show+1)>1500){
if((Show+1)>4200){
return Result.failure(200,"美股实时数据助力成功!"); return Result.failure(200,"美股实时数据助力成功!");
} }
// 提取 username // 提取 username

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

@ -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);
} }

Loading…
Cancel
Save