From 7fbb76204e3a145e54edb8f9bfcf002251acb34a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 03 九月 2024 10:02:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java b/src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java
index 28a7355..bc3a84e 100644
--- a/src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java
+++ b/src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java
@@ -2,13 +2,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.mzl.flower.dto.request.coupon.CreateCouponRecordDTO;
-import com.mzl.flower.dto.request.coupon.QueryCouponRecordDTO;
-import com.mzl.flower.dto.request.coupon.QueryCouponStatisticsBO;
-import com.mzl.flower.dto.request.coupon.QueryExistCouponDTO;
+import com.mzl.flower.dto.request.coupon.*;
 import com.mzl.flower.dto.response.coupon.CouponRecordVO;
 import com.mzl.flower.entity.coupon.CouponRecordDO;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -56,6 +54,26 @@
      * @param queryExistCouponDTO
      * @return
      */
-    int getExistCouponAmount(QueryExistCouponDTO queryExistCouponDTO);
+    Integer getExistCouponAmount(QueryExistCouponDTO queryExistCouponDTO);
+
+    /**
+     * 根据优惠券的ID来查找已经领取的优惠券的数量
+     * @param couponId
+     * @return
+     */
+    Integer getExistGainCouponRecordAmountById(String couponId);
+
+    Integer getUserGainCouponRecordAmountById(String couponId,Long customerId);
+
+    List<CouponRecordVO> getMineCouponRecordList(QueryMineCouponRecordDTO dto);
+
+    /**
+     * 检查优惠券是否到期
+     * @param dto
+     */
+    void checkCouponExpired(QueryMineCouponRecordDTO dto);
+
+    boolean checkCurMonVipCouponExists(String couponId, Long customId, LocalDateTime startDateTime,LocalDateTime endDateTime);
+
 
 }

--
Gitblit v1.9.3