From 0af329d7210a84c97ec071735a2d0d1d7b0b785c Mon Sep 17 00:00:00 2001 From: zhanglin8526 <852614290@qq.com> Date: 星期六, 26 八月 2023 13:58:48 +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 | 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