From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
index baf8025..d8eec1c 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/coupon/CouponService.java
@@ -1,11 +1,13 @@
package com.ruoyi.member.service.coupon;
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.*;
import com.ruoyi.member.domain.pojo.coupon.Coupon;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.member.Member;
import java.util.List;
@@ -43,10 +45,10 @@
* @description 平台获取优惠券编辑信息
* @author jqs
* @date 2023/6/13 14:29
- * @param couponId
+ * @param merBaseGetDto
* @return MerCouponGetVo
*/
- MerCouponGetVo getMerCouponVo(String couponId);
+ MerCouponGetVo getMerCouponVo(MerBaseGetDto merBaseGetDto);
/**
* @description 平台编辑优惠券
@@ -168,7 +170,7 @@
* @param appPageDto
* @return List<AppUnGetCouponPageVo>
*/
- List<AppGetAbleCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto, Long shopId);
+ List<AppGetAbleCouponPageVo> pageAppUserGetAbleCoupon(Page page, AppPageDto appPageDto, Member member);
@@ -191,5 +193,26 @@
*/
void autoTimeSendCoupon(String couponId);
+ /**
+ * @description 获取商户优惠券审核统计
+ * @author jqs
+ * @date 2023/7/28 11:30
+ * @param shopId
+ * @return MetAuditCouponTotalVo
+ */
+ MetAuditCouponTotalVo getMetAuditCouponTotal(Long shopId);
+ /**
+ * 立即结束
+ * @param mgtBaseGetDto
+ */
+ R endImmediately(MgtBaseGetDto mgtBaseGetDto);
+
+ /**
+ * 平台获取抽奖类型优惠券列表
+ * @return
+ */
+ List<LotteryEventCouponListVO> getLotteryEventCouponList();
+
+ List<LotteryEventCouponListVO> getLotteryEventCouponListByShopId(String shopId);
}
--
Gitblit v1.7.1