From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 ec98ae3..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
@@ -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())){
@@ -129,7 +128,7 @@
appBirthdayCardVo.setHaveBirthdayFlag(0);
}
}
- }
+
return R.ok(appBirthdayCardVo);
}
--
Gitblit v1.7.1