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-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
index 1533e98..357a50e 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java
@@ -5,6 +5,9 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
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.member.domain.dto.AppMemberBrowseDto;
import com.ruoyi.member.domain.vo.AppBirthdayCardVo;
import com.ruoyi.member.domain.vo.AppMemberPrizePageVo;
@@ -26,7 +29,9 @@
import javax.annotation.Resource;
import java.time.LocalDate;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author jqs34
@@ -52,12 +57,27 @@
@Resource
private BrowseRecordService browseRecordService;
+ @Resource
+ private LotteryEventClient lotteryEventClient;
+
@RequestMapping(value = "/getAppUserInfo", method = RequestMethod.POST)
@ApiOperation(value = "获取用户信息")
public R<AppUserInfoVo> getAppUserInfo() {
Long userId = SecurityUtils.getUserId();
AppUserInfoVo appUserInfoVo = memberService.getAppUserInfo(userId);
+ //判断是否可以抽奖
+ GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
+ getLotteryEventList.setActivityType(3);
+ getLotteryEventList.setUserId(SecurityUtils.getUserId());
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
+ Map<String, Object> map = new HashMap<>();
+ if(data.size() > 0){
+ TLotteryEvent tLotteryEvent = data.get(0);
+ appUserInfoVo.setLotteryEventId(tLotteryEvent.getId());
+ appUserInfoVo.setShareName(tLotteryEvent.getActivityProfile());
+ appUserInfoVo.setShareImage(tLotteryEvent.getCoverImage());
+ }
return R.ok(appUserInfoVo);
}
@@ -158,7 +178,7 @@
}
@RequestMapping(value = "/pageAppMemberPrize", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取用户奖品列表")
+ @ApiOperation(value = "分页获取用户奖品列表【2.0】")
public R<Page<AppMemberPrizePageVo>> pageAppMemberPrize(@RequestBody AppPageDto appPageDto) {
Long userId = SecurityUtils.getUserId();
appPageDto.setUserId(userId);
--
Gitblit v1.7.1