From ea1a62ba6484d6c6cb1ca67dcea938a95ba18fc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 18:26:26 +0800
Subject: [PATCH] 新增加用户端接口
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 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 de0a186..1533e98 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,11 +5,13 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
+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;
@@ -46,6 +48,9 @@
@Resource
private BirthdayCardService birthdayCardService;
+
+ @Resource
+ private BrowseRecordService browseRecordService;
@RequestMapping(value = "/getAppUserInfo", method = RequestMethod.POST)
@@ -100,23 +105,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);
}
@@ -156,4 +168,14 @@
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