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/CreateCouponTemplateActivyDTO.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateActivyDTO.java b/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateActivyDTO.java
index fd49d0e..6e2b34e 100644
--- a/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateActivyDTO.java
+++ b/src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateActivyDTO.java
@@ -6,10 +6,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-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.time.LocalDateTime;
@@ -113,6 +110,8 @@
*/
@ApiModelProperty(value = "使用条件,满多少钱")
@NotNull(message = "使用条件不能为空")
+ @Max(value = 99999999,message = "使用条件不能超过99999999")
+// @DecimalMin(value = "0.01", inclusive = true,message = "使用条件大于0")
private BigDecimal minOrderAmount;
/**
@@ -120,6 +119,8 @@
*/
@ApiModelProperty(value = "优惠券面值")
@NotNull(message = "优惠券面值不能为空")
+ @DecimalMin(value = "0.01", inclusive = true,message = "优惠券面值大于0")
+ @Max(value = 99999999,message = "优惠券面值不能超过99999999")
private BigDecimal couponDiscountValue;
--
Gitblit v1.9.3