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 | 200 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 172 insertions(+), 28 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 18e029a..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 @@ -1,6 +1,7 @@ package com.mzl.flower.service.impl.coupon; import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -29,8 +30,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +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; @@ -64,7 +67,6 @@ private CustomerService customerService; - @Override public List<CouponRecordVO> getList(QueryCouponRecordDTO dto) { return couponRecordMapperCustom.getList(dto); @@ -94,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 查看当前用户是否已经超领优惠券 @@ -134,7 +150,7 @@ } // 优惠券字段冗余 - couponRecordDO.setCategory(couponTemplateDO.getGetUserType()); + couponRecordDO.setCategory(couponTemplateDO.getCategory()); couponRecordDO.setCouponCode(couponTemplateDO.getCouponCode()); couponRecordDO.setCouponName(couponTemplateDO.getCouponName()); couponRecordDO.setCouponDiscountValue(couponTemplateDO.getCouponDiscountValue()); @@ -143,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()); // 根据优惠券模板来计算优惠券的生效开始时间和结束时间 @@ -167,7 +185,7 @@ // 领取后有段时间 领取后有效时间 // 根据发放后有效期来设置时间 if (couponTemplateDO.getUsageTimeNum() == null || couponTemplateDO.getUsageTimeNum() <= 0) { - throw new IllegalArgumentException("使用时间数量必须为正整数"); + throw new ValidationException("使用时间数量必须为正整数"); } LocalDateTime currentTime = LocalDateTime.now(); couponRecordDO.setEffectiveStart(currentTime); @@ -187,6 +205,8 @@ } } + // 手动设置ID + couponRecordDO.setId(IdUtil.simpleUUID()); return baseMapper.insert(couponRecordDO)>0; } finally { @@ -211,7 +231,7 @@ // 优惠券字段冗余 final CouponTemplateDO couponTemplateDO = couponTemplateService.getById(dto.getCouponId()); if(null!=couponTemplateDO){ - couponRecordDO.setCategory(couponTemplateDO.getGetUserType()); + couponRecordDO.setCategory(couponTemplateDO.getCategory()); couponRecordDO.setCouponCode(couponTemplateDO.getCouponCode()); couponRecordDO.setCouponName(couponTemplateDO.getCouponName()); couponRecordDO.setCouponDiscountValue(couponTemplateDO.getCouponDiscountValue()); @@ -273,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)){ @@ -291,6 +313,9 @@ couponTemplateDO.setUsageEndDate(lastDayEnd); couponTemplateDO.setGetStartDate(firstDayStart); couponTemplateDO.setGetEndDate(lastDayEnd); + + // 设置总数为当前会员的人数 + couponTemplateDO.setCouponAmount(CollectionUtils.isNotEmpty(customerList)?customerList.size():0); // 设置默认类型固定 couponTemplateDO.setUsageType(CouponUsageTypeEnum.FIXED.getType()); @@ -311,7 +336,7 @@ } @Override - public boolean expiredCouponRecordByListCurMonth() { + public boolean expiredCouponRecordLastMon() { try{ LocalDateTime now = LocalDateTime.now(); @@ -389,6 +414,17 @@ } @Override + public Integer getUserGainCouponRecordAmountByUserId(String couponId, String userId) { + QueryWrapper<CouponRecordDO> queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(CouponRecordDO::getDeleted, TrueOrFalseEnum.FALSE.isFlag()) + .eq(StringUtils.isNotBlank(couponId), CouponRecordDO::getCouponId,couponId) + .eq(null!=userId,CouponRecordDO::getUserId,userId) + ; + + return baseMapper.selectCount(queryWrapper); + } + + @Override public List<CouponRecordVO> getMineCouponRecordList(QueryMineCouponRecordDTO dto) { checkCouponExpired(dto); return couponRecordMapperCustom.getMineCouponRecordList(dto); @@ -428,24 +464,53 @@ @Transactional @Override - public boolean useCoupon(String couponId, String orderId) { + public boolean useCoupon(String couponId, String orderId, BigDecimal orderMount) { // 优惠券为空 if(StringUtils.isBlank(couponId)){ - throw new IllegalArgumentException("无效的优惠券"); - } - // 验证优惠券存在且有效 - final CouponRecordDO couponRecordDO = baseMapper.selectById(couponId); - if(null==couponRecordDO || StringUtils.isBlank(couponRecordDO.getOrderId()) ){ - throw new IllegalArgumentException("无效的优惠券"); - } - if(couponRecordDO.getStatus().equals(CouponUsedStatusEnum.USED.getType())){ - throw new IllegalArgumentException("优惠券已经被使用"); - } - if(couponRecordDO.getStatus().equals(CouponUsedStatusEnum.EXPIRED.getType()) || LocalDateTime.now().isAfter(couponRecordDO.getEffectiveEnd())){ - throw new IllegalArgumentException("优惠券已过期"); + throw new ValidationException("无效的优惠券"); } if(StringUtils.isBlank(orderId)){ - throw new IllegalArgumentException("订单id不能为空"); + throw new ValidationException("订单id不能为空"); + } + if(orderMount.compareTo(BigDecimal.ZERO)<=0){ + throw new ValidationException("订单金额不能小于0"); + } + + // 验证优惠券存在且有效 + final CouponRecordDO couponRecordDO = baseMapper.selectById(couponId); + if(null==couponRecordDO || StringUtils.isNotBlank(couponRecordDO.getOrderId()) ){ + throw new ValidationException("无效的优惠券"); + } + + if(couponRecordDO.getStatus().equals(CouponUsedStatusEnum.USED.getType())){ + throw new ValidationException("优惠券已经被使用"); + } + if(couponRecordDO.getStatus().equals(CouponUsedStatusEnum.EXPIRED.getType()) || LocalDateTime.now().isAfter(couponRecordDO.getEffectiveEnd())){ + throw new ValidationException("优惠券已过期"); + } + + // 根据类型判断是无门槛还是满减,如果是无门槛 + if(couponRecordDO.getCouponDiscountType().equals(CouponTypeEnum.ZERO.getType())){ + // 无门槛,查看金额是否大于满减值 + if(orderMount.compareTo(couponRecordDO.getCouponDiscountValue())<0){ + throw new ValidationException(String.format("订单金额(%s)小于无门槛的金额(%s)", orderMount, couponRecordDO.getCouponDiscountValue())); + } + } + + if(couponRecordDO.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType())){ + //满减,查看金额是否满足最小订单额 + if(orderMount.compareTo(couponRecordDO.getMinOrderAmount())<0){ + throw new ValidationException(String.format("订单金额(%s)小于最低折扣订单金额(%s)", orderMount, couponRecordDO.getMinOrderAmount())); + } + + if(orderMount.compareTo(couponRecordDO.getCouponDiscountValue())<0){ + throw new ValidationException(String.format("订单金额(%s)小于折扣的金额(%s)", orderMount, couponRecordDO.getCouponDiscountValue())); + } + } + + // 查看当前的优惠券是否是当前人员的 + if(!SecurityUtils.getUserId().equals(couponRecordDO.getUserId())){ + throw new ValidationException("优惠券不属于当前人员"); } // 优惠券使用操作 @@ -454,16 +519,24 @@ couponRecordDO.setOrderId(orderId); return baseMapper.updateById(couponRecordDO)>0; + } + @Transactional @Override - public boolean cancelCouponUsage(String couponId, String orderId) { + public boolean cancelCouponUsage(String orderId) { // 查询订单使用的优惠券 final CouponRecordDO couponRecordDO = getCouponByOrderId(orderId); - // TODO - - return false; + if(null==couponRecordDO){ + return false; + } + log.info("优惠券退回之前:"+ JSON.toJSONString(couponRecordDO)); + couponRecordDO.setStatus(CouponUsedStatusEnum.UNUSED.getType()); + couponRecordDO.setUsedTime(null); + couponRecordDO.setOrderId(null); + log.info("优惠券退回之后:"+ JSON.toJSONString(couponRecordDO)); + return baseMapper.updateById(couponRecordDO)>0; } @Override @@ -483,4 +556,75 @@ } return null; } + + @Override + public boolean checkUserCouponExists(String couponId, Long customId) { + QueryWrapper<CouponRecordDO> queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(CouponRecordDO::getDeleted,TrueOrFalseEnum.FALSE.isFlag()) + .eq(CouponRecordDO::getCouponId,couponId) + .eq(CouponRecordDO::getCustomerId,customId) + ; + 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