huliguo
15 小时以前 c279b0695286bea0e915981f4b8dc52abd039dd0
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java
@@ -146,7 +146,7 @@
         List<Map<String, String>> options = list.stream().map(item -> {
            Map<String, String> map = new HashMap<>();
            map.put("id", item.getId());
            map.put("name", item.getAnswer());
            map.put("name", item.getAnswers());
            return map;
         }).collect(Collectors.toList());
         vo.setOptions(options);
@@ -174,13 +174,13 @@
         List<Map<String, String>> options = list1.stream().map(item -> {
            Map<String, String> map = new HashMap<>();
            map.put("id", item.getId());
            map.put("name", item.getAnswer());
            map.put("name", item.getAnswers());
            return map;
         }).collect(Collectors.toList());
         if (-1 == dto.getStepOrDown()) {
            UserLotteryEventQuestionsAnswers one = userLotteryEventQuestionsAnswersService.getOne(new QueryWrapper<UserLotteryEventQuestionsAnswers>().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()).getAnswer());
               vo.setAnswer(lotteryEventQuestionsAnswersService.getById(one.getLotteryEventQuestionsAnswersId()).getAnswers());
            }
         }
         vo.setOptions(options);
@@ -195,7 +195,7 @@
      List<LotteryEventQuestions> list = lotteryEventServiceQuestionsService.list(new QueryWrapper<LotteryEventQuestions>().eq("lottery_event_id", dto.getId()).orderByAsc("sort"));
      LotteryEventQuestions lotteryEventQuestions = list.get(dto.getCurrent());
      List<LotteryEventQuestionsAnswers> list1 = lotteryEventQuestionsAnswersService.list(new QueryWrapper<LotteryEventQuestionsAnswers>().eq("lottery_event_questions_id", lotteryEventQuestions.getId()));
      LotteryEventQuestionsAnswers lotteryEventQuestionsAnswers = list1.stream().filter(item -> item.getAnswer().equals(dto.getAnswer())).findAny().orElse(null);
      LotteryEventQuestionsAnswers lotteryEventQuestionsAnswers = list1.stream().filter(item -> item.getAnswers().equals(dto.getAnswer())).findAny().orElse(null);
      //构建答题数据
      Long userId = SecurityUtils.getUserId();
      UserLotteryEventQuestions questionsServiceOne = userLotteryEventQuestionsService.getOne(new QueryWrapper<UserLotteryEventQuestions>().eq("lottery_event_id", dto.getId()).eq("user_id", userId));