From 5997dc8acfa81a6c867c28810d1c3c9714efc46c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 29 三月 2025 14:55:42 +0800
Subject: [PATCH] fix: 登录
---
src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java | 90 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
index a5138f9..398f1b3 100644
--- a/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java
@@ -33,6 +33,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.temporal.TemporalAdjusters;
+import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
@@ -95,15 +96,29 @@
// 获取锁，最多等待 10 秒，锁自动释放时间 30 秒
if (lock.tryLock(10, 30, TimeUnit.SECONDS)) {
try {
- // 活动优惠券和积分优惠券需要根据库存来控制- 根据优惠券的发放数量来控制有没有超发
- if(StringUtils.isNotBlank(couponTemplateDO.getCategory()) && (
- couponTemplateDO.getCategory().equals(CouponCategoryEnum.ACTIVITY.getStatus()) || couponTemplateDO.getCategory().equals(CouponCategoryEnum.POINT.getStatus())
- )){
+ // 活动优惠券 根据优惠券的发放数量来控制有没有超发
+ if(StringUtils.isNotBlank(couponTemplateDO.getCategory()) &&
+ couponTemplateDO.getCategory().equals(CouponCategoryEnum.ACTIVITY.getStatus())
+ ){
// 获取当前优惠券已经领取的数量
final Integer gainTotal = getExistGainCouponRecordAmountById(couponTemplateDO.getId());
if(couponTemplateDO.getCouponAmount().compareTo(gainTotal)<=0){
throw new ValidationException("当前优惠券已经领完！");
}
+ }
+ if(StringUtils.isNotBlank(couponTemplateDO.getCategory())
+ && couponTemplateDO.getCategory().equals(CouponCategoryEnum.POINT.getStatus()
+ )){
+ // 获取当前优惠券已经领取的数量
+
+ if(couponTemplateDO.getCouponAmount()<=0){
+ throw new ValidationException("当前优惠券已经领完！");
+ }else{
+ couponTemplateDO.setCouponAmount(couponTemplateDO.getCouponAmount()-1);
+ // 更新库存
+ couponTemplateService.updateById(couponTemplateDO);
+ }
+
}
// 根据用户领取设置的getLimit 查看当前用户是否已经超领优惠券
@@ -144,7 +159,9 @@
couponRecordDO.setCouponDiscountType(couponTemplateDO.getCouponDiscountType());
couponRecordDO.setGetUserType(couponTemplateDO.getGetUserType());
couponRecordDO.setPoint(couponTemplateDO.getPoint());
- couponRecordDO.setMemberId(couponRecordDO.getMemberId());
+ couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
+ couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
+ couponRecordDO.setCouponDescription(couponTemplateDO.getCouponDescription());
// 根据优惠券模板来计算优惠券的生效开始时间和结束时间
@@ -276,6 +293,8 @@
couponRecordDO.setEffectiveStart(firstDayStart);
couponRecordDO.setEffectiveEnd(lastDayEnd);
couponRecordDO.setMemberId(couponTemplateDO.getMemberId());
+ couponRecordDO.setImageUrl(couponTemplateDO.getImageUrl());
+ couponRecordDO.setCouponDescription(couponTemplateDO.getCouponDescription());
// 创建信息
couponRecordDO.create();
if(!checkCurMonVipCouponExists(couponRecordDO.getCouponId(),couponRecordDO.getCustomerId(),firstDayStart,lastDayEnd)){
@@ -547,4 +566,65 @@
;
return baseMapper.selectCount(queryWrapper)>0;
}
+
+ @Override
+ public boolean expireCouponRecordAll() {
+
+ return couponRecordMapperCustom.expireCouponRecordAll();
+ }
+
+ @Override
+ public CouponRecordVO getUnusedFit(QueryMineCouponRecordDTO dto) {
+
+ /**
+ * ①.先查询出满足条件的优惠券(满减面值最大)
+ * ②.查询面值最大的优惠券（无门槛面值最大）
+ * ③查询过期时间早的优惠券④在满足③的条件下，优先使用无门槛优惠券
+ * ④基于以上规则如果还存在相同的优惠券，任意选择一张优惠券即可
+ */
+
+ CouponRecordVO bestCoupon=null;
+ // 查出我所有可用优惠券
+ final List<CouponRecordVO> mineCouponRecordList = getMineCouponRecordList(dto);
+
+ if(null!=dto.getOrderAmount() && CollectionUtils.isNotEmpty(mineCouponRecordList)){
+ // ①.先查询出满足条件的优惠券
+ // 遍历优惠券列表，找出所有minOrderAmount >= dto.orderAmount ，且couponDiscountValue 最大的优惠券
+ // 筛选符合条件并找出优惠面值最大的优惠券
+ bestCoupon = mineCouponRecordList.stream()
+ // 筛选出 minOrderAmount >= dto.orderAmount 的优惠券并且优惠券类型是discount的
+ .filter(coupon -> coupon.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType()))
+ .filter(coupon -> coupon.getMinOrderAmount().compareTo(dto.getOrderAmount()) <= 0)
+ // 按 couponDiscountValue 倒序排序
+ .max(Comparator.comparing(CouponRecordVO::getCouponDiscountValue))
+ // 如果没有符合条件的优惠券，使用 Optional.orElse(null) 返回 null
+ .orElse(null);
+
+ if(null==bestCoupon){
+ // ②.查询面值最大的优惠券（无门槛面值最大）
+// 过滤出discountType 是zero的优惠券，并根据couponDiscountValue倒序排序
+ bestCoupon = mineCouponRecordList.stream()
+ .filter(coupon -> coupon.getCouponDiscountType().equals(CouponTypeEnum.ZERO.getType()))
+ .max(Comparator.comparing(CouponRecordVO::getCouponDiscountValue))
+ .orElse(null);
+
+ // ③查询过期时间早的优惠券
+ if(null!=bestCoupon){
+ final BigDecimal zeroMaxCouponDiscountValue = bestCoupon.getCouponDiscountValue();
+ // 过滤出discountType 是zero的优惠券，且couponDiscountValue与bestCoupon的couponDiscountValue面值一样的优惠券，并根据effectiveEnd正序排，获取第一条数据
+ CouponRecordVO effectiveEndEarlyCoupon= mineCouponRecordList.stream()
+ .filter(coupon -> coupon.getCouponDiscountType().equals(CouponTypeEnum.ZERO.getType()))
+ .filter(coupon -> coupon.getCouponDiscountValue().compareTo(zeroMaxCouponDiscountValue)==0)
+ .min(Comparator.comparing(CouponRecordVO::getEffectiveEnd))
+ .orElse(null);
+ if(null!=effectiveEndEarlyCoupon){
+ bestCoupon=effectiveEndEarlyCoupon;
+ }
+ }
+
+ }
+ }
+ return bestCoupon;
+
+ }
}
--
Gitblit v1.9.3