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/CouponRecordService.java |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 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 76e6ee8..530dc08 100644
--- a/src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java
+++ b/src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java
@@ -6,6 +6,8 @@
 import com.mzl.flower.dto.response.coupon.CouponRecordVO;
 import com.mzl.flower.entity.coupon.CouponRecordDO;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -40,7 +42,7 @@
      * 根据当月日期设置上个月的日期的优惠券过期
      * @return
      */
-    boolean expiredCouponRecordByListCurMonth();
+    boolean expiredCouponRecordLastMon();
 
     Integer statisCouponTemplateCount(QueryCouponStatisticsBO queryCouponStatisticsBO);
 
@@ -72,5 +74,34 @@
      */
     void checkCouponExpired(QueryMineCouponRecordDTO dto);
 
+    boolean checkCurMonVipCouponExists(String couponId, Long customId, LocalDateTime startDateTime,LocalDateTime endDateTime);
+
+
+    /**
+     * 优惠券的使用
+     * @param couponId 优惠券ID
+     * @param orderId 订单的ID
+     * @param orderMount 订单的金额
+     * @return
+     */
+    boolean useCoupon(String couponId, String orderId, BigDecimal orderMount);
+
+    /**
+     * 优惠券退单
+     * @param orderId
+     * @return
+     */
+    boolean cancelCouponUsage(String orderId);
+
+    /**
+     * 根据订单号查找优惠券信息
+     * @param orderId
+     * @return
+     */
+    List<CouponRecordDO> getCouponListByOrderId(String orderId) ;
+
+
+    CouponRecordDO getCouponByOrderId(String orderId) ;
+
 
 }

--
Gitblit v1.9.3