From f489850355bae6d690b2d3e6d0627f90bde79b1d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 九月 2024 18:59:51 +0800
Subject: [PATCH] 1.优惠券记录新增category查询字段 2.小程序-商品历史记录根据更新时间排序 3.优惠券-用户优惠券控制已下架的优惠券不可重新上架，及当前优惠券的已经发放的情况下不可再次下发
---
src/main/java/com/mzl/flower/service/impl/coupon/CouponRecordServiceImpl.java | 75 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 12 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..09c97f9 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,6 +30,7 @@
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.List;
@@ -62,7 +64,6 @@
@Autowired
private CustomerService customerService;
-
@Override
@@ -134,7 +135,7 @@
}
// 优惠券字段冗余
- couponRecordDO.setCategory(couponTemplateDO.getGetUserType());
+ couponRecordDO.setCategory(couponTemplateDO.getCategory());
couponRecordDO.setCouponCode(couponTemplateDO.getCouponCode());
couponRecordDO.setCouponName(couponTemplateDO.getCouponName());
couponRecordDO.setCouponDiscountValue(couponTemplateDO.getCouponDiscountValue());
@@ -211,7 +212,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());
@@ -292,6 +293,9 @@
couponTemplateDO.setGetStartDate(firstDayStart);
couponTemplateDO.setGetEndDate(lastDayEnd);
+ // 设置总数为当前会员的人数
+ couponTemplateDO.setCouponAmount(CollectionUtils.isNotEmpty(customerList)?customerList.size():0);
+
// 设置默认类型固定
couponTemplateDO.setUsageType(CouponUsageTypeEnum.FIXED.getType());
@@ -311,7 +315,7 @@
}
@Override
- public boolean expiredCouponRecordByListCurMonth() {
+ public boolean expiredCouponRecordLastMon() {
try{
LocalDateTime now = LocalDateTime.now();
@@ -428,24 +432,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("无效的优惠券");
}
+ if(StringUtils.isBlank(orderId)){
+ throw new IllegalArgumentException("订单id不能为空");
+ }
+ if(orderMount.compareTo(BigDecimal.ZERO)<=0){
+ throw new IllegalArgumentException("订单金额不能小于0");
+ }
+
// 验证优惠券存在且有效
final CouponRecordDO couponRecordDO = baseMapper.selectById(couponId);
- if(null==couponRecordDO || StringUtils.isBlank(couponRecordDO.getOrderId()) ){
+ if(null==couponRecordDO || StringUtils.isNotBlank(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("优惠券已过期");
}
- if(StringUtils.isBlank(orderId)){
- throw new IllegalArgumentException("订单id不能为空");
+
+ // 根据类型判断是无门槛还是满减，如果是无门槛
+ if(couponRecordDO.getCouponDiscountType().equals(CouponTypeEnum.ZERO.getType())){
+ // 无门槛，查看金额是否大于满减值
+ if(orderMount.compareTo(couponRecordDO.getCouponDiscountValue())<0){
+ throw new IllegalArgumentException(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()));
+ }
+
+ if(orderMount.compareTo(couponRecordDO.getCouponDiscountValue())<0){
+ throw new IllegalArgumentException(String.format("订单金额(%s)小于折扣的金额(%s)", orderMount, couponRecordDO.getCouponDiscountValue()));
+ }
+ }
+
+ // 查看当前的优惠券是否是当前人员的
+ if(!SecurityUtils.getUserId().equals(couponRecordDO.getUserId())){
+ throw new IllegalArgumentException("优惠券不属于当前人员");
}
// 优惠券使用操作
@@ -454,16 +487,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){
+ throw new IllegalArgumentException("优惠券不存在，无法操作");
+ }
+ 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 +524,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