From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/mapper/coupon/CouponMapper.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 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 751831b..b9d1752 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
@@ -2,13 +2,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.member.domain.dto.MerCouponPageDto;
import com.ruoyi.member.domain.dto.MgtCouponAuditPageDto;
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.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;
import java.util.List;
@@ -62,4 +62,55 @@
* @return void
*/
void updateCouponTotal( @Param("couponId")String couponId, @Param("sendTotal")Integer sendTotal, @Param("sendPerson")Integer sendPerson);
+
+
+ /**
+ * @description 平台获取优惠券列表
+ * @author jqs
+ * @date 2023/6/30 16:53
+ * @param page
+ * @param merPageDto
+ * @return List<MerCouponPageVo>
+ */
+ List<MerCouponPageVo> pagePlatformMerCoupon(Page page, @Param("param")MerPageDto merPageDto);
+
+ /**
+ * @description 获取商户优惠券列表
+ * @author jqs
+ * @date 2023/6/30 16:53
+ * @param page
+ * @param merPageDto
+ * @return List<MerCouponPageVo>
+ */
+ List<MerCouponPageVo> pageShopMerCoupon(Page page, @Param("param") MerCouponPageDto merPageDto);
+
+ /**
+ * @description 获取用户不能获取的优惠券id
+ * @author jqs
+ * @date 2023/7/9 18:06
+ * @param userId
+ * @return List<Long>
+ */
+ 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);
}
--
Gitblit v1.7.1