From b6a7f6e41467f73f26fc7f209652e19ff26c3752 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期二, 03 九月 2024 20:18:32 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

---
 src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 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 bc3a84e..9482623 100644
--- a/src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java
+++ b/src/main/java/com/mzl/flower/service/coupon/CouponRecordService.java
@@ -41,7 +41,7 @@
      * 根据当月日期设置上个月的日期的优惠券过期
      * @return
      */
-    boolean expiredCouponRecordByListCurMonth();
+    boolean expiredCouponRecordLastMon();
 
     Integer statisCouponTemplateCount(QueryCouponStatisticsBO queryCouponStatisticsBO);
 
@@ -75,5 +75,31 @@
 
     boolean checkCurMonVipCouponExists(String couponId, Long customId, LocalDateTime startDateTime,LocalDateTime endDateTime);
 
+    /**
+     * 优惠券使用
+     * @param couponId
+     * @param orderId
+     * @return
+     */
+    boolean useCoupon(String couponId,String orderId);
+
+    /**
+     * 优惠券退单
+     * @param couponId
+     * @param orderId
+     * @return
+     */
+    boolean cancelCouponUsage(String couponId,String orderId);
+
+    /**
+     * 根据订单号查找优惠券信息
+     * @param orderId
+     * @return
+     */
+    List<CouponRecordDO> getCouponListByOrderId(String orderId) ;
+
+
+    CouponRecordDO getCouponByOrderId(String orderId) ;
+
 
 }

--
Gitblit v1.9.3