Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

Pu Zhibing

2025-06-23 fe56b4374be4b40fab45cf08e38e3ccd491fdc98

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java

@@ -25,6 +25,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
@@ -69,6 +70,16 @@
   })
   public R<LotteryEventVo> getLotteryEvent(@PathVariable("id") String id) {
      LotteryEventVo lotteryEvent = lotteryEventService.getLotteryEvent(id);
      TLotteryEvent event = lotteryEventService.getById(id);
      if (LocalDateTime.now().isBefore(event.getStartTime())) {
         lotteryEvent.setStatus(1);
      }
      if (LocalDateTime.now().isAfter(event.getEndTime())) {
         lotteryEvent.setStatus(3);
      }
      if (LocalDateTime.now().isAfter(event.getStartTime()) && LocalDateTime.now().isBefore(event.getEndTime())) {
         lotteryEvent.setStatus(2);
      }
      return R.ok(lotteryEvent);
   }
   
@@ -79,7 +90,7 @@
   @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "抽奖活动id", required = true, dataType = "String", paramType = "path")
   })
   public R lotteryDraw(@PathVariable("id") String id) {
   public R<TLotteryEventPrize> lotteryDraw(@PathVariable("id") String id) {
      return lotteryEventService.lotteryDraw(id);
   }
   
@@ -96,13 +107,13 @@
      activityPageVoList.forEach(vo -> {
         String startTime = vo.getStartTime();
         String endTime = vo.getEndTime();
         if (LocalDateTime.now().isBefore(LocalDateTime.parse(startTime))) {
         if (LocalDateTime.now().isBefore(LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) {
            vo.setStatus(1);
         }
         if (LocalDateTime.now().isAfter(LocalDateTime.parse(endTime))) {
         if (LocalDateTime.now().isAfter(LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) {
            vo.setStatus(3);
         }
         if (LocalDateTime.now().isAfter(LocalDateTime.parse(startTime)) && LocalDateTime.now().isBefore(LocalDateTime.parse(endTime))) {
         if (LocalDateTime.now().isAfter(LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))) && LocalDateTime.now().isBefore(LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))) {
            vo.setStatus(2);
         }
      });
@@ -124,6 +135,7 @@
      vo.setName(lotteryEvent.getName());
      vo.setActivityProfile(lotteryEvent.getActivityProfile());
      vo.setStartTime(lotteryEvent.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      vo.setEndTime(lotteryEvent.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      vo.setActivityContent(lotteryEvent.getActivityContent());
      int count = userLotteryEventService.count(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId));
      vo.setParticipation(count > 0);
@@ -133,6 +145,12 @@
         vo.setContinueAnswer(null != questionsServiceOne ? questionsServiceOne.getStatus() : 0);
         vo.setAnswerStartTime(null != questionsServiceOne ? questionsServiceOne.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) : null);
         vo.setAnswerTimeLimit(lotteryEvent.getAnsweringTime());
         if (vo.getContinueAnswer() == 1) {
            long remainingTime = lotteryEvent.getAnsweringTime() - LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) - questionsServiceOne.getCreateTime().toEpochSecond(ZoneOffset.of("+8"));
            int count1 = userLotteryEventQuestionsAnswersService.count(new QueryWrapper<TUserLotteryEventQuestionsAnswers>().eq("lottery_event_id", id).eq("user_id", userId));
            vo.setRemainingTime(remainingTime);
            vo.setCurrent(count1 - 1);
         }
      }
      return R.ok(vo);
   }
@@ -167,7 +185,7 @@
         //上一题
         Integer current = dto.getCurrent();
         if (-1 == dto.getStepOrDown()) {
            if (current - 1 <= 0) {
            if (current - 1 < 0) {
               return R.fail("操作失败");
            }
            current--;
@@ -251,6 +269,9 @@
      Long userId = SecurityUtils.getUserId();
      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.setStatus(2);
      questionsServiceOne.setEndTime(LocalDateTime.now());
      //计算正确率