From 2fa295d338b81513b62737ee00948c2de9140c7a Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 20 六月 2025 09:08:00 +0800
Subject: [PATCH] 优惠券管理
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 2a0ac58..51cd570 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
@@ -106,8 +106,7 @@
Member member = memberService.getByUserId(userId);
AppBirthdayCardVo appBirthdayCardVo = new AppBirthdayCardVo();
appBirthdayCardVo.setCheckBirthdayCard(0);
- if(member.getBindingFlag()==1){
- Integer check = birthdayCardService.checkBirthdayCard(member.getRelationShopId());
+ Integer check = birthdayCardService.checkBirthdayCard(member.getRelationShopId(),member.getBindingFlag());
if(check==1){
appBirthdayCardVo.setCheckBirthdayCard(1);
if(StringUtils.isNotBlank(member.getBirthday())){
@@ -118,6 +117,7 @@
int todayMonth = today.getMonthValue();
if (birthdayMonth == todayMonth) {
appBirthdayCardVo = birthdayCardService.getUserBirthdayCard(userId,member.getRelationShopId());
+ appBirthdayCardVo.setCheckBirthdayCard(1);
appBirthdayCardVo.setHaveBirthdayFlag(1);
appBirthdayCardVo.setInBirthdayFlag(1);
} else {
@@ -128,7 +128,7 @@
appBirthdayCardVo.setHaveBirthdayFlag(0);
}
}
- }
+
return R.ok(appBirthdayCardVo);
}
@@ -158,7 +158,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