From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/birthday/BirthdayCardService.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 2bff0e8..5ab8201 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,14 +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.AppBirthdayCardVo;
-import com.ruoyi.member.domain.vo.MerBirthdayEditInfoVo;
-import com.ruoyi.member.domain.vo.MerBirthdayGetVo;
-import com.ruoyi.member.domain.vo.MgtBirthdayGetVo;
+import com.ruoyi.member.domain.vo.*;
+
+import java.util.List;
/**
* <p>
@@ -103,4 +103,22 @@
*/
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);
}
--
Gitblit v1.7.1