From b646898adf3f2ad119dd9fd1c7c01d7f0742bf97 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期四, 31 七月 2025 11:41:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java index a4cb5c4..284d34d 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java @@ -63,12 +63,12 @@ @ResponseBody - @PostMapping("/getLotteryEvent/{id}") + @PostMapping("/getLotteryEvent/{id}/{orderId}") @ApiOperation(value = "获取抽奖页详情【2.0】", tags = "抽奖活动") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path") }) - public R<LotteryEventVo> getLotteryEvent(@PathVariable("id") String id) { + public R<LotteryEventVo> getLotteryEvent(@PathVariable("id") String id, @PathVariable("orderId") String orderId) { LotteryEventVo lotteryEvent = lotteryEventService.getLotteryEvent(id); TLotteryEvent event = lotteryEventService.getById(id); if (LocalDateTime.now().isBefore(event.getStartTime())) { @@ -85,12 +85,12 @@ @ResponseBody - @PostMapping("/lotteryDraw/{id}") + @PostMapping("/lotteryDraw/{id}/{orderId}") @ApiOperation(value = "抽奖操作【2.0】", tags = "抽奖活动", notes = "返回奖品ID") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path") }) - public R<TLotteryEventPrize> lotteryDraw(@PathVariable("id") String id) { + public R<TLotteryEventPrize> lotteryDraw(@PathVariable("id") String id, @PathVariable("orderId") String orderId) { return lotteryEventService.lotteryDraw(id); } @@ -122,12 +122,12 @@ @ResponseBody - @PostMapping("/getLotteryEventInfo/{id}") + @PostMapping("/getLotteryEventInfo/{id}/{orderId}") @ApiOperation(value = "获取抽奖活动详情【2.0】", tags = "抽奖活动") @ApiImplicitParams({ @ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path") }) - public R<LotteryEventInfoVo> getLotteryEventInfo(@PathVariable("id") String id){ + public R<LotteryEventInfoVo> getLotteryEventInfo(@PathVariable("id") String id, @PathVariable("orderId") String orderId){ Long userId = SecurityUtils.getUserId(); TLotteryEvent lotteryEvent = lotteryEventService.getById(id); LotteryEventInfoVo vo = new LotteryEventInfoVo(); @@ -209,12 +209,18 @@ map.put("name", item.getAnswers()); return map; }).collect(Collectors.toList()); - if (-1 == dto.getStepOrDown() || current == list.size() - 1) { - TUserLotteryEventQuestionsAnswers one = userLotteryEventQuestionsAnswersService.getOne(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_question_id", lotteryEventQuestions.getId()).eq("user_id", userId).orderByDesc("create_time").last(" limit 0, 1")); - if (null != one) { - vo.setAnswer(lotteryEventQuestionsAnswersService.getById(one.getLotteryEventQuestionsAnswersId()).getAnswers()); - } + + TUserLotteryEventQuestionsAnswers one = userLotteryEventQuestionsAnswersService.getOne(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_question_id", lotteryEventQuestions.getId()).eq("user_id", userId).orderByDesc("create_time").last(" limit 0, 1")); + if (null != one) { + vo.setAnswer(lotteryEventQuestionsAnswersService.getById(one.getLotteryEventQuestionsAnswersId()).getAnswers()); } + +// if (-1 == dto.getStepOrDown() || current == list.size() - 1) { +// TUserLotteryEventQuestionsAnswers one = userLotteryEventQuestionsAnswersService.getOne(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_question_id", lotteryEventQuestions.getId()).eq("user_id", userId).orderByDesc("create_time").last(" limit 0, 1")); +// if (null != one) { +// vo.setAnswer(lotteryEventQuestionsAnswersService.getById(one.getLotteryEventQuestionsAnswersId()).getAnswers()); +// } +// } vo.setOptions(options); } return R.ok(vo); -- Gitblit v1.7.1