修改bug

puzhibing

13 小时以前 d2a65425646e33c26b8a98c394c7990a6bfb6b03

 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -1,13 +1,24 @@
package com.ruoyi.auth.controller;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.ruoyi.goods.api.domain.LotteryEvent;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.goods.api.domain.GetLotteryEventList;
import com.ruoyi.goods.api.domain.TLotteryEvent;
import com.ruoyi.goods.api.domain.TLotteryEventUser;
import com.ruoyi.goods.api.service.LotteryEventClient;
import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,17 +26,9 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;

@@ -78,11 +81,21 @@
        Map<String, Object> miniToken = tokenService.createMiniToken(appMiniLoginVo);
        //判断新用户是都符合抽奖条件
        miniToken.put("lotteryDraw", false);
      List<LotteryEvent> data = lotteryEventClient.getLotteryEventList(1).getData();
      GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
      getLotteryEventList.setActivityType(1);
      getLotteryEventList.setUserId(SecurityUtils.getUserId());
      List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
      if (data.size() > 0) {
            miniToken.put("lotteryDraw", true);
         miniToken.put("lotteryEventId", data.get(0).getId());
         //将数据添加到普通抽奖列表中
         TLotteryEventUser lotteryEventUser = new TLotteryEventUser();
         lotteryEventUser.setId(IdUtils.simpleUUID());
         lotteryEventUser.setLotteryEventId(data.get(0).getId());
         lotteryEventUser.setUser_id(SecurityUtils.getUserId());
         lotteryEventClient.addLotteryEventUser(lotteryEventUser);
        }
      return R.ok();
      return R.ok(miniToken);
   }
   
   @DeleteMapping("logout")