From 272188e47087a8ef92eb0a48b122fa1c73ea94d3 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 00:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateUserDTO.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateUserDTO.java b/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateUserDTO.java
index 1af6f04..bee84cf 100644
--- a/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateUserDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateUserDTO.java
@@ -4,10 +4,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -62,6 +59,7 @@
     @ApiModelProperty(value = "使用条件")
     @NotNull(message = "使用条件不能为空")
     @Max(value = 99999999,message = "使用条件不能超过99999999")
+//    @DecimalMin(value = "0.01", inclusive = true,message = "使用条件大于0")
     private BigDecimal minOrderAmount;
 
     /**
@@ -69,7 +67,7 @@
      */
     @ApiModelProperty(value = "优惠券面值")
     @NotNull(message = "优惠券面值不能为空")
-    @Min(value = 1,message = "优惠券面值大于0")
+    @DecimalMin(value = "0.01", inclusive = true,message = "优惠券面值大于0")
     @Max(value = 99999999,message = "优惠券面值不能超过99999999")
     private BigDecimal couponDiscountValue;
 

--
Gitblit v1.9.3