From 9adfc0c5aa084bc61807ce43badf8b9f48b588c3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期四, 05 九月 2024 17:16:16 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

---
 src/main/java/com/mzl/flower/service/coupon/CouponTemplateService2.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 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..a1b7339 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,36 @@
 
     /**
      * 积分统计
+     *
      * @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);
+
+    /**
+     * 获取活动优惠券
+     * 1.需要领取时间在有效期内的
+     * 2.已经发布的
+     * @param dto
+     * @return
+     */
+    List<CouponTemplateVO> getActivityEffectList(QueryActivityEffectCouponDTO dto);
+
+    void exchangeCoupon(ExchangeCouponDTO dto);
 }

--
Gitblit v1.9.3