diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java index 8d9708c3..92065e9a 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningAmountController.java @@ -2,6 +2,9 @@ package com.sqx.modules.discSpinning.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.RedisKeys; import com.sqx.common.utils.RedisUtils; import com.sqx.common.utils.Result; @@ -13,6 +16,8 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @Slf4j @RestController @Api(value = "现金红包 抽奖配置", tags = {"现金红包 抽奖金额配置"}) @@ -59,7 +64,10 @@ public class DiscSpinningAmountController { @GetMapping("/selectDiscSpinningAmount") @ApiOperation("查询现金红包 抽奖配置") public Result selectDiscSpinningAmount(Integer page, Integer limit) { - return Result.success().put("data", discSpinningAmountService.page(new Page<>(page, limit), new QueryWrapper().orderByDesc("status").orderByAsc("num","random","max_amount"))); + PageHelper.startPage(page, limit); + List list = discSpinningAmountService.list(new QueryWrapper().orderByDesc("status").orderByAsc("num", "random", "max_amount")); + PageInfo pageInfo = new PageInfo<>(list); + return Result.success().put("data", PageUtils.page(pageInfo, true)); } } diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java index 3feb9978..fc40cd9c 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -235,6 +235,9 @@ public class DiscSpinningController { if (source == 1 && sourceId == null) { throw new CzgException("异常请求"); } + if(sourceId == null){ + return Result.error("请求失败,请联系管理员"); + } if (DataLimitUtil.isAllowed(RedisKeys.getDateKey("spinning:draw:") + sourceId, 120)) { DiscSpinningRecord draws = discSpinningService.draws(i == null ? 1 : i + 1, amount, sourceId, userId, source); executor.schedule(() -> discSpinningService.receive1(draws), 4, TimeUnit.SECONDS); diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index 84bd22da..a23e08bb 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -262,11 +262,11 @@ public class TempOrdersTask { // .eq(InviteAchievement::getState, 1)); Set byUserIdList = inviteAchievementService.list(new LambdaQueryWrapper().eq(InviteAchievement::getUserId, sourceUser.getUserId()) .eq(InviteAchievement::getState, 1).select(InviteAchievement::getTargetUserId)).stream().map(InviteAchievement::getTargetUserId).collect(Collectors.toSet()); - int count = 0; + int count; if (!byUserIdList.isEmpty()) { List list = userInfoService.list(new LambdaQueryWrapper().in(UserInfo::getUserId, byUserIdList).isNotNull(UserInfo::getAccountNo).select(UserInfo::getCertNo)); logger.info("邀请用户实名信息: {}", list.stream().map(UserInfo::getCertNo).collect(Collectors.toSet())); - UserInfo userInfo = userInfoService.getOne(new LambdaQueryWrapper().eq(UserInfo::getUserId, user.getUserId()).select(UserInfo::getCertNo)); + UserInfo userInfo = userInfoService.getOne(new LambdaQueryWrapper().eq(UserInfo::getUserId, sourceUser.getUserId()).select(UserInfo::getCertNo)); Set collect = userInfoService.list(new LambdaQueryWrapper().in(UserInfo::getUserId, byUserIdList).isNotNull(UserInfo::getAccountNo).select(UserInfo::getCertNo)) .stream().map(UserInfo::getCertNo).collect(Collectors.toSet()); // 去除与本人身份信息相同的用户