From 03f1f3372a10a08f96f3308bfa099e86a55046d0 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 30 一月 2024 09:32:38 +0800 Subject: [PATCH] 修改数据权限bug --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 53 insertions(+), 2 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 7e9565e..c2b7b28 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,13 @@ 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.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 +30,7 @@ * @date 2023/5/3 1:47 * @version 1.0 */ - List<AppMemberCouponVo> listVoMemberCouponByUserId(Long userId); + List<AppMemberCouponVo> listVoMemberCouponByUserId(MerBaseDto merBaseDto); /** * @description 核销优惠券 @@ -65,5 +69,52 @@ * @param appMemberCouponPageDto * @return List<AppMemberCouponPageVo> */ - List<AppMemberCouponPageVo> pageAppUserGetCoupon(Page page, AppMemberCouponPageDto appMemberCouponPageDto); + List<AppMemberCouponPageVo> pageAppUserGetCoupon(Page page, AppMemberCouponPageDto appMemberCouponPageDto, Member member); + + /** + * @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); + + /** + * @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