From c7ac989e5a693bf29efb4fbaee16770442ea41a0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 七月 2025 16:15:14 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 3f2abb9..9832120 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -9,6 +9,7 @@
 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.service.LotteryEventClient;
 import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
@@ -77,11 +78,15 @@
         Map<String, Object> miniToken = tokenService.createMiniToken(appMiniLoginVo);
         //判断新用户是都符合抽奖条件
         miniToken.put("lotteryDraw", false);
-		List<TLotteryEvent> 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());
         }
-		return R.ok();
+		return R.ok(miniToken);
 	}
 	
 	@DeleteMapping("logout")

--
Gitblit v1.7.1