From d2a65425646e33c26b8a98c394c7990a6bfb6b03 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 16 九月 2025 18:57:32 +0800 Subject: [PATCH] 修改bug --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java index d8ae1ca..df8d06e 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java @@ -3,8 +3,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.bean.BeanUtils; +import com.ruoyi.common.core.utils.uuid.IdUtils; import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.goods.api.domain.GetLotteryEventList; import com.ruoyi.goods.api.domain.TLotteryEvent; +import com.ruoyi.goods.api.domain.TLotteryEventUser; import com.ruoyi.goods.api.service.LotteryEventClient; import com.ruoyi.member.domain.vo.AppIntegralRecordPageVo; import com.ruoyi.member.domain.vo.AppIntegralTaskListVo; @@ -89,17 +93,26 @@ integralChangeDto.setIntegralType(1); integralChangeDto.setUserId(userId); Boolean complete = memberService.changeIntegral(integralChangeDto); -// if (complete) { -// throw new ServiceException(AppErrorConstant.DOUBLE_INTEGRAL_TASK); -// } + if (complete) { + throw new ServiceException(AppErrorConstant.DOUBLE_INTEGRAL_TASK); + } //判断是否可以抽奖 - List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData(); + GetLotteryEventList getLotteryEventList = new GetLotteryEventList(); + getLotteryEventList.setActivityType(3); + getLotteryEventList.setUserId(SecurityUtils.getUserId()); + List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData(); Map<String, Object> map = new HashMap<>(); if(data.size() > 0){ TLotteryEvent tLotteryEvent = data.get(0); map.put("lotteryEventId", tLotteryEvent.getId()); map.put("name", tLotteryEvent.getActivityProfile()); map.put("image", tLotteryEvent.getCoverImage()); + //将数据添加到普通抽奖列表中 + TLotteryEventUser lotteryEventUser = new TLotteryEventUser(); + lotteryEventUser.setId(IdUtils.simpleUUID()); + lotteryEventUser.setLotteryEventId(tLotteryEvent.getId()); + lotteryEventUser.setUser_id(SecurityUtils.getUserId()); + lotteryEventClient.addLotteryEventUser(lotteryEventUser); } return R.ok(map); } -- Gitblit v1.7.1