From db7f0be6a4f8d3e76ddd726fd2f3648d0e0a2e6e Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 28 七月 2025 20:06: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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 06010bc..21fc9f1 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
@@ -249,6 +249,8 @@
one.setLotteryEventQuestionId(lotteryEventQuestions.getId());
one.setLotteryEventQuestionsAnswersId(lotteryEventQuestionsAnswers.getId());
one.setCreateTime(LocalDateTime.now());
+ }else{
+ one.setLotteryEventQuestionsAnswersId(lotteryEventQuestionsAnswers.getId());
}
one.setIsCorrect(0);
//答案正确
@@ -270,7 +272,12 @@
TLotteryEvent lotteryEvent = lotteryEventService.getById(id);
TUserLotteryEventQuestions questionsServiceOne = userLotteryEventQuestionsService.getOne(new QueryWrapper<TUserLotteryEventQuestions>().eq("lottery_event_id", id).eq("user_id", userId));
if (null == questionsServiceOne) {
- return R.fail("请先进行答题操作");
+ questionsServiceOne = new TUserLotteryEventQuestions();
+ questionsServiceOne.setId(IdUtils.simpleUUID());
+ questionsServiceOne.setUserId(userId);
+ questionsServiceOne.setLotteryEventId(id);
+ questionsServiceOne.setStatus(1);
+ questionsServiceOne.setCreateTime(LocalDateTime.now());
}
questionsServiceOne.setStatus(2);
questionsServiceOne.setEndTime(LocalDateTime.now());
@@ -280,7 +287,7 @@
int right = list.stream().filter(item -> 1 == item.getIsCorrect()).collect(Collectors.toList()).size();
BigDecimal multiply = new BigDecimal(right).divide(new BigDecimal(count), 4, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
questionsServiceOne.setCorrectAnswerRate(multiply);
- userLotteryEventQuestionsService.updateById(questionsServiceOne);
+ userLotteryEventQuestionsService.saveOrUpdate(questionsServiceOne);
if (multiply.compareTo(lotteryEvent.getAccuracy()) >= 0) {
return R.ok(true);
}
--
Gitblit v1.7.1