From 8984621c2c100f5e1663c9194e0fd61d2d44ead3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 15:03:43 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 4887702..b1146c1 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
@@ -186,14 +186,15 @@
Integer current = dto.getCurrent();
if (-1 == dto.getStepOrDown()) {
if (current - 1 < 0) {
- return R.fail("操作失败");
+ current = 0;
}
current--;
} else {
+ current++;
//下一题
current++;
if (current >= count) {
- return R.fail("操作失败");
+ current = count - 1;
}
}
List<TLotteryEventQuestions> list = lotteryEventServiceQuestionsService.list(new QueryWrapper<TLotteryEventQuestions>().eq("lottery_event_id", dto.getId()).orderByAsc("sort"));
@@ -208,7 +209,7 @@
map.put("name", item.getAnswers());
return map;
}).collect(Collectors.toList());
- if (-1 == dto.getStepOrDown()) {
+ if (-1 == dto.getStepOrDown() || current == list.size() - 1) {
TUserLotteryEventQuestionsAnswers one = userLotteryEventQuestionsAnswersService.getOne(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_id", dto.getId()).eq("user_id", userId).orderByDesc("create_time").last(" limit 0, 1"));
if (null != one) {
vo.setAnswer(lotteryEventQuestionsAnswersService.getById(one.getLotteryEventQuestionsAnswersId()).getAnswers());
@@ -258,6 +259,8 @@
one.setIsCorrect(1);
}
userLotteryEventQuestionsAnswersService.saveOrUpdate(one);
+ //判断
+
return R.ok();
}
--
Gitblit v1.7.1