From b0fbbbb3967ca64173cb89fa88c0e86b9d4c5069 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 25 九月 2025 10:51:22 +0800 Subject: [PATCH] 修改快手核销bug --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java index 827b69f..d6f98da 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java @@ -7,10 +7,7 @@ import com.ruoyi.member.domain.dto.MgtCouponListDto; import com.ruoyi.member.domain.dto.MgtCouponPageDto; import com.ruoyi.member.domain.pojo.coupon.Coupon; -import com.ruoyi.member.domain.vo.MerCouponPageVo; -import com.ruoyi.member.domain.vo.MgtCouponAuditPageVo; -import com.ruoyi.member.domain.vo.MgtCouponPageVo; -import com.ruoyi.member.domain.vo.MgtCouponSimpleListVo; +import com.ruoyi.member.domain.vo.*; import com.ruoyi.system.api.domain.dto.MerPageDto; import org.apache.ibatis.annotations.Param; @@ -97,5 +94,31 @@ List<String> listUserUnGetCoupon(@Param("userId")Long userId); + /** + * @description 获取不能获取的优惠券id + * @author jqs + * @date 2023/7/9 18:06 + * @return List<Long> + */ + List<String> listUnGetCoupon(); + + /** + * @description 可领取优惠券列表 + * @author jqs + * @date 2023/7/11 10:32 + * @param page + * @param shopId + * @param unGetList + * @return List<AppGetAbleCouponPageVo> + */ + List<AppGetAbleCouponPageVo> getAbleCouponPageVoList(Page page, @Param("shopId") Long shopId, @Param("userId") Long userId, @Param("memberFlag") Integer memberFlag, @Param("unGetList") List<String> unGetList); + + /** + * + * @return + */ + List<LotteryEventCouponListVO> getLotteryEventCouponList(@Param("shopId") Long shopId); + + List<LotteryEventCouponListVO> getLotteryEventCouponListByShopId(@Param("shopId") String shopId); } -- Gitblit v1.7.1