From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/birthday/BirthdayCardService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/birthday/BirthdayCardService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/birthday/BirthdayCardService.java
index 5ab8201..f8c00df 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/birthday/BirthdayCardService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/birthday/BirthdayCardService.java
@@ -5,7 +5,7 @@
import com.ruoyi.member.domain.dto.MerBirthdayEditDto;
import com.ruoyi.member.domain.dto.MgtBirthdayEditDto;
import com.ruoyi.member.domain.dto.MgtBirthdayGetDto;
-import com.ruoyi.member.domain.pojo.birthday.BirthdayCard;
+import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
import com.ruoyi.member.domain.vo.*;
import java.util.List;
@@ -120,5 +120,14 @@
* @param
* @return void
*/
- Integer checkBirthdayCard(Long shopId);
+ Integer checkBirthdayCard(Long shopId,Integer bindingFlag);
+
+ /**
+ * @description 获取平台生日卡
+ * @author jqs
+ * @date 2023/8/9 19:35
+ * @param
+ * @return BirthdayCard
+ */
+ BirthdayCard getBirthdayCard();
}
--
Gitblit v1.7.1