修改bug

Pu Zhibing

12 小时以前 cead7b98d5cebc0825b919799e23732877361de0

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java

@@ -91,7 +91,7 @@
      //答题正确率
      if (5 == lotteryEvent.getActivityType()) {
         TUserLotteryEventQuestions questionsServiceOne = userLotteryEventQuestionsAnswersService.getOne(new QueryWrapper<TUserLotteryEventQuestions>().eq("lottery_event_id", id).eq("user_id", userId));
         if (null == questionsServiceOne) {
         if (null != questionsServiceOne) {
            vo.setCorrectAnswerRate(questionsServiceOne.getCorrectAnswerRate());
         }
      }
@@ -102,10 +102,12 @@
         userLotteryEventVo.setName(s.getObjectName());
         userLotteryEventVo.setPrizeType(s.getPrizeType());
         userLotteryEventVo.setNumber(s.getNumber());
         MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrizeByGiftId(s.getId()).getData();
         userLotteryEventVo.setVerifyCode("3-" + memberGiftRecord.getPrizeId());
         userLotteryEventVo.setIsVerify(1 == memberGiftRecord.getVerifyStatus() ? 0 : 1);
         userLotteryEventVo.setVerifyTime(null == memberGiftRecord.getVerifyTime() ? "" : sdf.format(memberGiftRecord.getVerifyTime()));
         if (Arrays.asList(2, 3).contains(s.getPrizeType())) {
            MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrizeByGiftId(s.getId()).getData();
            userLotteryEventVo.setVerifyCode("3-" + memberGiftRecord.getPrizeId());
            userLotteryEventVo.setIsVerify(1 == memberGiftRecord.getVerifyStatus() ? 0 : 1);
            userLotteryEventVo.setVerifyTime(null == memberGiftRecord.getVerifyTime() ? "" : sdf.format(memberGiftRecord.getVerifyTime()));
         }
         Member member = remoteMemberService.getMember(userId).getData();
         userLotteryEventVo.setVerifyShop("全部门店");
         if (null != member && null != member.getRelationShopId()) {
@@ -126,7 +128,7 @@
    * @return
    */
   @Override
   public R lotteryDraw(String id) {
   public R<TLotteryEventPrize> lotteryDraw(String id) {
      Long userId = SecurityUtils.getUserId();
      Member member = remoteMemberService.getMember(userId).getData();
      TLotteryEvent lotteryEvent = this.getById(id);
@@ -163,7 +165,7 @@
            Collections.shuffle(list);
            //开始获取随机数
            int random = new Random().nextInt(list.size());
            TLotteryEventPrize lotteryEventPrize = lotteryEventPrizeList.get(random);
            TLotteryEventPrize lotteryEventPrize = list.get(random);
            //添加中奖商品
            TUserLotteryEvent userLotteryEvent = new TUserLotteryEvent();
            userLotteryEvent.setId(IdUtils.simpleUUID());
@@ -218,7 +220,7 @@
            memberGiftRecord.setCreateTime(new Date());
            memberGiftRecord.setVerifyStatus(1);
            remoteMemberService.saveMemberGiftRecord(memberGiftRecord);
            return R.ok();
            return R.ok(lotteryEventPrize);
         }
      } catch (Exception e) {
         e.printStackTrace();