From d2a65425646e33c26b8a98c394c7990a6bfb6b03 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 16 九月 2025 18:57:32 +0800
Subject: [PATCH] 修改bug
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 1bf3dae..b84ef0b 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
@@ -6,10 +6,14 @@
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;
@@ -77,10 +81,19 @@
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());
+ //将数据添加到普通抽奖列表中
+ 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(miniToken);
}
--
Gitblit v1.7.1