From 03dd384bb8b78f04eadcf619849b3687fa98c6c1 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期六, 22 七月 2023 18:19:47 +0800
Subject: [PATCH] 微信支付,支付与结果通知

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/birthday/BirthdayCardService.java |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 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 3ffd35c..5f5fd5a 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,13 +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.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>
@@ -81,4 +82,34 @@
      * @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);
 }

--
Gitblit v1.7.1