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/member/MemberCouponService.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 3c8875d..e600c13 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
@@ -2,10 +2,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
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.Member;
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;
@@ -26,7 +31,7 @@
* @date 2023/5/3 1:47
* @version 1.0
*/
- List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId);
+ List<AppMemberCouponVo> listVoMemberCouponByUserId(MerBaseDto merBaseDto);
/**
* @description 核销优惠券
@@ -35,7 +40,7 @@
* @param verifyCoupon
* @return void
*/
- MerVerifyCouponGetVo getVerifyCoupon(String verifyCoupon);
+ MerVerifyCouponGetVo getVerifyCoupon(Long verifyCoupon);
/**
* @description 核销优惠券
@@ -44,7 +49,7 @@
* @param memberCouponId
* @return MerVerifyCouponGetVo
*/
- MerVerifyCouponGetVo sureVerifyCoupon(String memberCouponId);
+ MerVerifyCouponGetVo sureVerifyCoupon(Long memberCouponId);
/**
* @description
@@ -65,7 +70,7 @@
* @param appMemberCouponPageDto
* @return List<AppMemberCouponPageVo>
*/
- List<AppMemberCouponPageVo> pageAppUserGetCoupon(Page page, AppMemberCouponPageDto appMemberCouponPageDto);
+ List<AppMemberCouponPageVo> pageAppUserGetCoupon(Page page, AppMemberCouponPageDto appMemberCouponPageDto, Member member);
/**
* @description 定时检查优惠券过期
@@ -85,6 +90,7 @@
*/
void useMemberCoupon(String memberCouponIds);
+
/**
* @description 使用优惠券
* @author jqs
@@ -93,4 +99,35 @@
* @return void
*/
void backMemberCoupon(String memberCouponIds);
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/19 17:35
+ * @param
+ * @return List<MerMemberCouponVo>
+ */
+ List<MerMemberCouponVo> listMerShopGoodsMemberCoupon(MerGoodsCouponListDto merGoodsCouponListDto);
+
+ /**
+ * @param memberCouponId
+ * @param shopId
+ * @return void
+ * @description 确认核销优惠券
+ * @author jqs
+ * @date 2023/8/15 11:21
+ */
+ void sureMemberCoupon(Long memberCouponId, Long shopId);
+
+ void insert(MemberCoupon memberCoupon);
+
+
+ /**
+ * 手动添加用户优惠券
+ *
+ * @param couponId
+ * @param number
+ * @return
+ */
+ R addMemberCoupon(String couponId, Integer number, Long userId);
}
--
Gitblit v1.7.1