diff --git a/luoo_user/src/main/java/com/luoo/user/dto/point/DrawDTO.java b/luoo_user/src/main/java/com/luoo/user/dto/point/DrawDTO.java index a662b88..92a8311 100644 --- a/luoo_user/src/main/java/com/luoo/user/dto/point/DrawDTO.java +++ b/luoo_user/src/main/java/com/luoo/user/dto/point/DrawDTO.java @@ -36,4 +36,7 @@ public class DrawDTO implements Serializable { @ApiModelProperty(value = "抽奖id") String lotteryId; + + @ApiModelProperty(value = "抽奖时间") + String showTime; } \ No newline at end of file diff --git a/luoo_user/src/main/java/com/luoo/user/service/LotteryService.java b/luoo_user/src/main/java/com/luoo/user/service/LotteryService.java index 5adde7f..89a1c10 100644 --- a/luoo_user/src/main/java/com/luoo/user/service/LotteryService.java +++ b/luoo_user/src/main/java/com/luoo/user/service/LotteryService.java @@ -457,6 +457,10 @@ public class LotteryService { .userId(userLoginDto.getUserId()) .taskPointId(TaskPointIdConstants.LOTTERY) .build(); + if (Objects.equals(PointEnums.LOTTERY_TICKET.getCode(), lottery.getType()) && regionId != null) { + LotteryRegion byLotteryIdAndRegionId = lotteryRegionDao.findByLotteryIdAndRegionId(id, regionId); + drawDTO.setShowTime(byLotteryIdAndRegionId.getShowTime()); + } rabbitTemplate.convertAndSend("draw", drawDTO); } diff --git a/luoo_user/src/main/java/com/luoo/user/service/UserPointLogService.java b/luoo_user/src/main/java/com/luoo/user/service/UserPointLogService.java index 65c330d..fdf4749 100644 --- a/luoo_user/src/main/java/com/luoo/user/service/UserPointLogService.java +++ b/luoo_user/src/main/java/com/luoo/user/service/UserPointLogService.java @@ -264,6 +264,7 @@ public class UserPointLogService { .createUser(drawDTO.getUserId()) .updateUser(drawDTO.getUserId()) .popup(PointEnums.NOT_POPUP.getCode()) + .showTime(drawDTO.getShowTime()) .build(); lotteryUserDao.save(lotteryUser);