src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateActivyController.java
@@ -11,10 +11,7 @@
import com.mzl.flower.dto.response.coupon.CouponTemplatePointVO;
import com.mzl.flower.dto.response.coupon.CouponTemplateVO;
import com.mzl.flower.entity.coupon.CouponTemplateDO;
import com.mzl.flower.enums.CouponCategoryEnum;
import com.mzl.flower.enums.CouponGetUserTypeEnum;
import com.mzl.flower.enums.CouponTypeEnum;
import com.mzl.flower.enums.CouponUsageTypeEnum;
import com.mzl.flower.enums.*;
import com.mzl.flower.service.coupon.CouponTemplateService2;
import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
@@ -27,6 +24,7 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -136,6 +134,27 @@
            throw new ValidationException("优惠券不存在");
        }
        // 判断当前时间是否在优惠券的领取时间范围内
        LocalDateTime now = LocalDateTime.now();
//        if (couponTemplateDO.getGetStartDate() != null && couponTemplateDO.getGetEndDate() != null) {
//            if (now.isBefore(couponTemplateDO.getGetStartDate()) || now.isAfter(couponTemplateDO.getGetEndDate())) {
//                throw new ValidationException("当前时间不在优惠券领取时间范围内,不能发布优惠券。");
//            }
//        } else {
//            throw new ValidationException("优惠券的领取时间未设置。");
//        }
        // 检查结束时间是否存在
        if (couponTemplateDO.getGetEndDate() != null) {
            // 如果当前时间小于结束时间,允许发布
            if (now.isAfter(couponTemplateDO.getGetEndDate())) {
                throw new ValidationException("当前时间已超过优惠券领取结束时间,不能发布优惠券。");
            }
        } else {
            throw new ValidationException("优惠券的领取结束时间未设置。");
        }
        couponTemplateService.activeCouponTemplate(id);
        return returnData(R.SUCCESS.getCode(), null);
@@ -158,11 +177,22 @@
    private void valid(CreateCouponTemplateActivyDTO dto){
        if (StringUtils.isNotBlank(dto.getCouponDiscountType())
                && dto.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType())
                && dto.getMinOrderAmount().compareTo(dto.getCouponDiscountValue()) < 0) {
            throw new ValidationException("订单金额不能小于折扣金额");
//        if (StringUtils.isNotBlank(dto.getCouponDiscountType())
//                && dto.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType())
//                && dto.getMinOrderAmount().compareTo(dto.getCouponDiscountValue()) < 0) {
//            throw new ValidationException("优惠券使用条件不能小于面值金额");
//        }
        if (StringUtils.isNotBlank(dto.getCouponDiscountType()) && dto.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType())) {
            if(dto.getMinOrderAmount().compareTo(BigDecimal.ZERO)<=0){
                throw new ValidationException("优惠券使用条件不能小于0");
            }
            if(dto.getMinOrderAmount().compareTo(dto.getCouponDiscountValue()) < 0){
                throw new ValidationException("优惠券使用条件不能小于面值金额");
            }
        }
        if (StringUtils.isNotBlank(dto.getCouponDiscountType())
                && dto.getCouponDiscountType().equals(CouponTypeEnum.DISCOUNT.getType())
                && dto.getCouponDiscountValue().compareTo(BigDecimal.ZERO) <= 0) {
@@ -184,6 +214,19 @@
            if(dto.getUsageEndDate()==null){
                throw new ValidationException("固定时间结束日期不能为空");
            }
            if(dto.getUsageStartDate().isAfter(dto.getUsageEndDate())){
                throw new ValidationException("固定时间开始时间不能大于结束日期");
            }
            // 固定时间的使用开始时间必须大于领取的结束时间
            if(null!=dto.getGetEndDate() && null!=dto.getUsageStartDate() && dto.getGetEndDate().isAfter(dto.getUsageStartDate())){
                throw new ValidationException("使用开始时间必须大于领取结束时间!");
            }
        }
        // 领取后 有效时间
@@ -200,6 +243,18 @@
                throw new ValidationException("领取后有效时间整数需要大于0");
            }
        }
        // 用户获取的类型是首页领取的话
        if(StringUtils.isNotBlank(dto.getGetType()) && dto.getGetType().equals(dto.getGetType().equals(CouponGetTypeEnum.HOME.getType()))
        ){
            // 优惠券图片校验
            if(StringUtils.isBlank(dto.getImageUrl())){
                throw new ValidationException("优惠券图片不能为空");
            }
        }
        //
    }
}