From 8495247c638d9b201eedfaf09bbf38e0fecda87d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 30 八月 2024 09:53:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java b/src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java
index 858c401..f30f175 100644
--- a/src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java
+++ b/src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.mzl.flower.dto.request.coupon.*;
+import com.mzl.flower.dto.response.coupon.CouponPointStatisVO;
import com.mzl.flower.dto.response.coupon.CouponTemplateVO;
import com.mzl.flower.entity.coupon.CouponTemplateDO;
@@ -59,8 +60,25 @@
/**
* 积分统计
+ *
* @param queryCouponStatisticsBO
* @return
*/
- CouponTemplateVO statisCouponTemplatePoint(QueryCouponStatisticsBO queryCouponStatisticsBO);
+ CouponPointStatisVO statisCouponTemplatePoint(QueryCouponStatisticsBO queryCouponStatisticsBO);
+
+
+ /**
+ * 积分优惠券全部
+ * @param dto
+ * @return
+ */
+ List<CouponTemplateVO> getPointList(QueryActivePointCouponDTO dto);
+
+ /**
+ * 积分优惠券列表
+ * @param page
+ * @param dto
+ * @return
+ */
+ Page<CouponTemplateVO> getPointPage(Page page, QueryActivePointCouponDTO dto);
}
--
Gitblit v1.9.3