From e858d188bcab66261b106907cdb8fbfdfe28460b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 15:17:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java | 95 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 76 insertions(+), 19 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 0931a3e..fe7a7d0 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,16 +5,19 @@
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.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;
import com.ruoyi.member.domain.vo.AppSuggestPageVo;
import com.ruoyi.member.domain.vo.AppUserInfoVo;
import com.ruoyi.member.service.birthday.BirthdayCardService;
+import com.ruoyi.member.service.member.BrowseRecordService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.service.member.MemberSuggestService;
import com.ruoyi.system.api.constant.AppErrorConstant;
-import com.ruoyi.system.api.domain.dto.AppEditUserDto;
-import com.ruoyi.system.api.domain.dto.AppSuggestPageDto;
-import com.ruoyi.system.api.domain.dto.AppUserSuggestDto;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.Member;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -25,7 +28,9 @@
import javax.annotation.Resource;
import java.time.LocalDate;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @author jqs34
@@ -48,12 +53,27 @@
@Resource
private BirthdayCardService birthdayCardService;
+ @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);
+ //判断是否可以抽奖
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(3).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);
}
@@ -84,6 +104,14 @@
Long userId = SecurityUtils.getUserId();
appUserSuggestDto.setUserId(userId);
memberSuggestService.userSuggest(appUserSuggestDto);
+ IntegralChangeDto integralChangeDto = new IntegralChangeDto();
+ if(appUserSuggestDto.getSuggestType()==1){
+ integralChangeDto.setIntegralType(2);
+ }else{
+ integralChangeDto.setIntegralType(3);
+ }
+ integralChangeDto.setUserId(userId);
+ memberService.changeIntegral(integralChangeDto);
return R.ok();
}
@@ -93,23 +121,30 @@
Long userId = SecurityUtils.getUserId();
Member member = memberService.getByUserId(userId);
AppBirthdayCardVo appBirthdayCardVo = new AppBirthdayCardVo();
- if(StringUtils.isNotBlank(member.getBirthday())){
- appBirthdayCardVo.setHaveBirthdayFlag(1);
- String birthday = member.getBirthday();
- LocalDate today = LocalDate.now();
- int birthdayMonth = Integer.parseInt(birthday.split("-")[1]);
- int todayMonth = today.getMonthValue();
- if (birthdayMonth == todayMonth) {
- appBirthdayCardVo = birthdayCardService.getUserBirthdayCard(userId,member.getRelationShopId());
- appBirthdayCardVo.setHaveBirthdayFlag(1);
- appBirthdayCardVo.setInBirthdayFlag(1);
- } else {
- appBirthdayCardVo.setHaveBirthdayFlag(1);
- appBirthdayCardVo.setInBirthdayFlag(0);
+ appBirthdayCardVo.setCheckBirthdayCard(0);
+ Integer check = birthdayCardService.checkBirthdayCard(member.getRelationShopId(),member.getBindingFlag());
+ if(check==1){
+ appBirthdayCardVo.setCheckBirthdayCard(1);
+ if(StringUtils.isNotBlank(member.getBirthday())){
+ appBirthdayCardVo.setHaveBirthdayFlag(1);
+ String birthday = member.getBirthday();
+ LocalDate today = LocalDate.now();
+ int birthdayMonth = Integer.parseInt(birthday.split("-")[1]);
+ int todayMonth = today.getMonthValue();
+ if (birthdayMonth == todayMonth) {
+ appBirthdayCardVo = birthdayCardService.getUserBirthdayCard(userId,member.getRelationShopId());
+ appBirthdayCardVo.setCheckBirthdayCard(1);
+ appBirthdayCardVo.setHaveBirthdayFlag(1);
+ appBirthdayCardVo.setInBirthdayFlag(1);
+ } else {
+ appBirthdayCardVo.setHaveBirthdayFlag(1);
+ appBirthdayCardVo.setInBirthdayFlag(0);
+ }
+ }else{
+ appBirthdayCardVo.setHaveBirthdayFlag(0);
+ }
}
- }else{
- appBirthdayCardVo.setHaveBirthdayFlag(0);
- }
+
return R.ok(appBirthdayCardVo);
}
@@ -137,4 +172,26 @@
}
return R.ok(appBirthdayCardVo);
}
+
+ @RequestMapping(value = "/pageAppMemberPrize", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取用户奖品列表【2.0】")
+ public R<Page<AppMemberPrizePageVo>> pageAppMemberPrize(@RequestBody AppPageDto appPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ appPageDto.setUserId(userId);
+ Page<AppMemberPrizePageVo> page = new Page<>();
+ page.setSize(appPageDto.getPageSize());
+ page.setCurrent(appPageDto.getPageNum());
+ List<AppMemberPrizePageVo> memberPrizePageVoList = birthdayCardService.pageAppMemberPrize(page,userId);
+ return R.ok(page.setRecords(memberPrizePageVoList));
+ }
+
+
+ @RequestMapping(value = "/browseRecord", method = RequestMethod.POST)
+ @ApiOperation(value = "浏览记录")
+ public R browseRecord(@RequestBody AppMemberBrowseDto appMemberBrowseDto) {
+ Long userId = SecurityUtils.getUserId();
+ appMemberBrowseDto.setUserId(userId);
+ browseRecordService.browseRecord(appMemberBrowseDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1