From 0b413f3fd67110cfd7752f27eb171bde06edc4b4 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期五, 18 八月 2023 18:56:39 +0800 Subject: [PATCH] bug --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 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..e34eb51 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 @@ -3,9 +3,12 @@ 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; @@ -26,7 +29,7 @@ * @date 2023/5/3 1:47 * @version 1.0 */ - List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId); + List<AppMemberCouponVo> listVoMemberCouponByUserId(MerBaseDto merBaseDto); /** * @description 核销优惠券 @@ -85,6 +88,7 @@ */ void useMemberCoupon(String memberCouponIds); + /** * @description 使用优惠券 * @author jqs @@ -93,4 +97,23 @@ * @return void */ void backMemberCoupon(String memberCouponIds); + + /** + * @description + * @author jqs + * @date 2023/7/19 17:35 + * @param + * @return List<MerMemberCouponVo> + */ + List<MerMemberCouponVo> listMerShopGoodsMemberCoupon(MerGoodsCouponListDto merGoodsCouponListDto); + + /** + * @description 确认核销优惠券 + * @author jqs + * @date 2023/8/15 11:21 + * @param memberCouponId + * @param shopId + * @return void + */ + void sureMemberCoupon(String memberCouponId,Long shopId); } -- Gitblit v1.7.1