From e858d188bcab66261b106907cdb8fbfdfe28460b Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 29 七月 2025 15:17:58 +0800 Subject: [PATCH] 修改bug --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 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 b166943..d8ae1ca 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 @@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @ClassName AppIntegralController @@ -81,17 +83,24 @@ @RequestMapping(value = "/signShare", method = RequestMethod.POST) @ApiOperation(value = "今日分享【2.0】") - public R<String> signShare() { + public R<Map<String, Object>> signShare() { Long userId = SecurityUtils.getUserId(); IntegralChangeDto integralChangeDto = new IntegralChangeDto(); 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(); - return R.ok(data.size() > 0 ? data.get(0).getId() : ""); + 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()); + } + return R.ok(map); } } -- Gitblit v1.7.1