From 1dcf56ed0e9484fbd7f78c7ca0037f359c136892 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Mon, 13 Jan 2025 14:24:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?selectDiscSpinningAmount=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DiscSpinningAmountController.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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)); } } From 9e70bfd42e7c24e1e689fdbfed245b74468203a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Mon, 13 Jan 2025 15:13:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8B=89=E6=96=B0=E5=A5=96=E5=8A=B1bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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()); // 去除与本人身份信息相同的用户 From 84089405d17c512432789058b4d15d342cfdcc1d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 13 Jan 2025 15:39:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discSpinning/controller/DiscSpinningController.java | 3 +++ 1 file changed, 3 insertions(+) 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 cbdd5fdd..2784e3f3 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -233,6 +233,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);