From 6ab383249b70a9646ffde1474b59dcc7d0b97df6 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 15:05:15 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java
index 2c7f6b4..224d9ac 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java
@@ -1,8 +1,14 @@
package com.ruoyi.member.service.member;
-import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.member.domain.dto.AppMemberCouponPageDto;
+import com.ruoyi.member.domain.dto.MerGoodsCouponListDto;
+import com.ruoyi.member.domain.vo.AppMemberCouponPageVo;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
+import com.ruoyi.system.api.domain.vo.MerMemberCouponVo;
import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo;
import java.util.List;
@@ -23,7 +29,7 @@
* @date 2023/5/3 1:47
* @version 1.0
*/
- List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId);
+ List<AppMemberCouponVo> listVoMemberCouponByUserId(MerBaseDto merBaseDto);
/**
* @description 核销优惠券
@@ -48,8 +54,55 @@
* @author jqs
* @date 2023/6/29 11:43
* @param userId
- * @param couponId
+ * @param couponId
* @return Integer
*/
Integer totalMemberCouponByUserAndCoupon(Long userId,String couponId);
+
+
+ /**
+ * @description 用户分页获取已领取优惠券列表
+ * @author jqs
+ * @date 2023/7/11 16:25
+ * @param page
+ * @param appMemberCouponPageDto
+ * @return List<AppMemberCouponPageVo>
+ */
+ List<AppMemberCouponPageVo> pageAppUserGetCoupon(Page page, AppMemberCouponPageDto appMemberCouponPageDto);
+
+ /**
+ * @description 定时检查优惠券过期
+ * @author jqs
+ * @date 2023/7/12 19:19
+ * @param
+ * @return void
+ */
+ void timingCheckMemberCoupon();
+
+ /**
+ * @description 使用优惠券
+ * @author jqs
+ * @date 2023/7/13 19:38
+ * @param memberCouponIds
+ * @return void
+ */
+ void useMemberCoupon(String memberCouponIds);
+
+ /**
+ * @description 使用优惠券
+ * @author jqs
+ * @date 2023/7/13 19:38
+ * @param memberCouponIds
+ * @return void
+ */
+ void backMemberCoupon(String memberCouponIds);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/19 17:35
+ * @param
+ * @return List<MerMemberCouponVo>
+ */
+ List<MerMemberCouponVo> listMerShopGoodsMemberCoupon(MerGoodsCouponListDto merGoodsCouponListDto);
}
--
Gitblit v1.7.1