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 | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 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 46fe72b..9482623 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; /** @@ -43,7 +41,7 @@ * 根据当月日期设置上个月的日期的优惠券过期 * @return */ - boolean expiredCouponRecordByListCurMonth(); + boolean expiredCouponRecordLastMon(); Integer statisCouponTemplateCount(QueryCouponStatisticsBO queryCouponStatisticsBO); @@ -67,4 +65,41 @@ 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); + + /** + * 优惠券使用 + * @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