From ac70afa4e394626dc03d82def3df1db886bb7c2e Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期四, 12 九月 2024 14:43:59 +0800 Subject: [PATCH] 1.活动优惠券-管理端-类型是首页领取的活动优惠券,发布的时候将已经发布的设置为下架,只能留有一个已发布的优惠券 3.活动优惠券-小程序-新增首页弹窗优惠券-如果领取数量没有超过当前优惠券还可以再次领取,超过领取优惠券的话则不返回数据 --- src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 37 insertions(+), 14 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 ec5067b..a5138f9 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 @@ -135,7 +135,7 @@ } // 优惠券字段冗余 - couponRecordDO.setCategory(couponTemplateDO.getGetUserType()); + couponRecordDO.setCategory(couponTemplateDO.getCategory()); couponRecordDO.setCouponCode(couponTemplateDO.getCouponCode()); couponRecordDO.setCouponName(couponTemplateDO.getCouponName()); couponRecordDO.setCouponDiscountValue(couponTemplateDO.getCouponDiscountValue()); @@ -168,7 +168,7 @@ // 领取后有段时间 领取后有效时间 // 根据发放后有效期来设置时间 if (couponTemplateDO.getUsageTimeNum() == null || couponTemplateDO.getUsageTimeNum() <= 0) { - throw new IllegalArgumentException("使用时间数量必须为正整数"); + throw new ValidationException("使用时间数量必须为正整数"); } LocalDateTime currentTime = LocalDateTime.now(); couponRecordDO.setEffectiveStart(currentTime); @@ -188,6 +188,8 @@ } } + // 手动设置ID + couponRecordDO.setId(IdUtil.simpleUUID()); return baseMapper.insert(couponRecordDO)>0; } finally { @@ -212,7 +214,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()); @@ -393,6 +395,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); @@ -435,50 +448,50 @@ public boolean useCoupon(String couponId, String orderId, BigDecimal orderMount) { // 优惠券为空 if(StringUtils.isBlank(couponId)){ - 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 IllegalArgumentException("订单金额不能小于0"); + throw new ValidationException("订单金额不能小于0"); } // 验证优惠券存在且有效 final CouponRecordDO couponRecordDO = baseMapper.selectById(couponId); if(null==couponRecordDO || StringUtils.isNotBlank(couponRecordDO.getOrderId()) ){ - throw new IllegalArgumentException("无效的优惠券"); + throw new ValidationException("无效的优惠券"); } if(couponRecordDO.getStatus().equals(CouponUsedStatusEnum.USED.getType())){ - throw new IllegalArgumentException("优惠券已经被使用"); + throw new ValidationException("优惠券已经被使用"); } if(couponRecordDO.getStatus().equals(CouponUsedStatusEnum.EXPIRED.getType()) || LocalDateTime.now().isAfter(couponRecordDO.getEffectiveEnd())){ - throw new IllegalArgumentException("优惠券已过期"); + throw new ValidationException("优惠券已过期"); } // 根据类型判断是无门槛还是满减,如果是无门槛 if(couponRecordDO.getCouponDiscountType().equals(CouponTypeEnum.ZERO.getType())){ // 无门槛,查看金额是否大于满减值 if(orderMount.compareTo(couponRecordDO.getCouponDiscountValue())<0){ - throw new IllegalArgumentException(String.format("订单金额(%s)小于无门槛的金额(%s)", orderMount, couponRecordDO.getCouponDiscountValue())); + 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 IllegalArgumentException(String.format("订单金额(%s)小于最低折扣订单金额(%s)", orderMount, couponRecordDO.getMinOrderAmount())); + throw new ValidationException(String.format("订单金额(%s)小于最低折扣订单金额(%s)", orderMount, couponRecordDO.getMinOrderAmount())); } if(orderMount.compareTo(couponRecordDO.getCouponDiscountValue())<0){ - throw new IllegalArgumentException(String.format("订单金额(%s)小于折扣的金额(%s)", orderMount, couponRecordDO.getCouponDiscountValue())); + throw new ValidationException(String.format("订单金额(%s)小于折扣的金额(%s)", orderMount, couponRecordDO.getCouponDiscountValue())); } } // 查看当前的优惠券是否是当前人员的 if(!SecurityUtils.getUserId().equals(couponRecordDO.getUserId())){ - throw new IllegalArgumentException("优惠券不属于当前人员"); + throw new ValidationException("优惠券不属于当前人员"); } // 优惠券使用操作 @@ -497,7 +510,7 @@ // 查询订单使用的优惠券 final CouponRecordDO couponRecordDO = getCouponByOrderId(orderId); if(null==couponRecordDO){ - throw new IllegalArgumentException("优惠券不存在,无法操作"); + return false; } log.info("优惠券退回之前:"+ JSON.toJSONString(couponRecordDO)); couponRecordDO.setStatus(CouponUsedStatusEnum.UNUSED.getType()); @@ -524,4 +537,14 @@ } 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; + } } -- Gitblit v1.9.3