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 | 101 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 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 efa9904..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
@@ -1,10 +1,14 @@
package com.ruoyi.member.service.birthday;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+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.member.domain.vo.MgtBirthdayGetVo;
+import com.ruoyi.system.api.domain.poji.member.BirthdayCard;
+import com.ruoyi.member.domain.vo.*;
+
+import java.util.List;
/**
* <p>
@@ -33,4 +37,97 @@
* @return MgtBirthdayGetVo
*/
MgtBirthdayGetVo getMgtBirthdayCard(MgtBirthdayGetDto mgtBirthdayGetDto);
+
+ /**
+ * @description 获取平台生日卡
+ * @author jqs
+ * @date 2023/7/1 15:25
+ * @param
+ * @return MerBirthdayGetVo
+ */
+ MerBirthdayGetVo getMerPlatformBirthdayCard(Long shopId);
+
+ /**
+ * @description 获取平台生日卡
+ * @author jqs
+ * @date 2023/7/1 15:25
+ * @param
+ * @return MerBirthdayGetVo
+ */
+ MerBirthdayGetVo getMerShopBirthdayCard(Long shopId);
+
+ /**
+ * @description 获取商户生日卡详情
+ * @author jqs
+ * @date 2023/7/3 10:58
+ * @param shopId
+ * @return MerBirthdayGetVo
+ */
+ MerBirthdayEditInfoVo getMerShopBCEditInfo(Long shopId);
+
+ /**
+ * @description 商户编辑生日卡
+ * @author jqs
+ * @date 2023/7/3 14:15
+ * @param merBirthdayEditDto
+ * @return void
+ */
+ void editMerBirthdayCard(MerBirthdayEditDto merBirthdayEditDto);
+
+ /**
+ * @description 开关生日卡成功
+ * @author jqs
+ * @date 2023/7/3 14:27
+ * @param merBirthdayEditDto
+ * @return void
+ */
+ void toggleMerBirthdayCard(MerBirthdayEditDto merBirthdayEditDto);
+
+ /**
+ * @description 获取用户生日礼物
+ * @author jqs
+ * @date 2023/7/7 10:55
+ * @param shopId
+ * @return AppBirthdayCardVo
+ */
+ AppBirthdayCardVo getUserBirthdayCard(Long userId,Long shopId);
+
+
+
+ /**
+ * @description 获取用户生日礼物
+ * @author jqs
+ * @date 2023/7/7 10:55
+ * @param shopId
+ * @return AppBirthdayCardVo
+ */
+ AppBirthdayCardVo getBirthdayGift(Long userId, Long shopId);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/11 18:12
+ * @param page
+ * @param userId
+ * @return List<AppMemberPrizePageVo>
+ */
+ List<AppMemberPrizePageVo> pageAppMemberPrize(Page page, Long userId);
+
+ /**
+ * @description 判断生日卡开启状态
+ * @author jqs
+ * @date 2023/8/1 15:43
+ * @param
+ * @return void
+ */
+ Integer checkBirthdayCard(Long shopId,Integer bindingFlag);
+
+ /**
+ * @description 获取平台生日卡
+ * @author jqs
+ * @date 2023/8/9 19:35
+ * @param
+ * @return BirthdayCard
+ */
+ BirthdayCard getBirthdayCard();
}
--
Gitblit v1.7.1