From f10a7c29f1a3748b28d2809335625c7888473b26 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 22:21:19 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
index 3077c9c..8b05d81 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
@@ -3,9 +3,12 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.core.utils.uuid.IdUtils;
 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.member.domain.vo.AppIntegralRecordPageVo;
 import com.ruoyi.member.domain.vo.AppIntegralTaskListVo;
@@ -101,9 +104,15 @@
         Map<String, Object> map = new HashMap<>();
         if(data.size() > 0){
             TLotteryEvent tLotteryEvent = data.get(0);
-            map.put("lotteryEventId", tLotteryEvent.getId());
+            map.put("lotteryEventId", tLotteryEvent.getId().toString());
             map.put("name", tLotteryEvent.getActivityProfile());
             map.put("image", tLotteryEvent.getCoverImage());
+            //将数据添加到普通抽奖列表中
+            TLotteryEventUser lotteryEventUser = new TLotteryEventUser();
+            lotteryEventUser.setId(IdUtils.simpleUUID());
+            lotteryEventUser.setLotteryEventId(tLotteryEvent.getId().toString());
+            lotteryEventUser.setUser_id(SecurityUtils.getUserId());
+            lotteryEventClient.addLotteryEventUser(lotteryEventUser);
         }
         return R.ok(map);
     }

--
Gitblit v1.7.1