From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3
---
src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplateUserDTO.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 6f428ff..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,9 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-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;
@@ -52,6 +50,7 @@
@ApiModelProperty(value ="领取后有效时间整数，比如90（天，小时，分钟）" )
@NotNull(message = "领取后有效时间不能为空")
@Min(value = 1,message = "领取后有效时间必须大于0")
+ @Max(value = 99999999,message = "领取后有效时间不能超过99999999")
private Integer usageTimeNum;
/**
@@ -59,6 +58,8 @@
*/
@ApiModelProperty(value = "使用条件")
@NotNull(message = "使用条件不能为空")
+ @Max(value = 99999999,message = "使用条件不能超过99999999")
+// @DecimalMin(value = "0.01", inclusive = true,message = "使用条件大于0")
private BigDecimal minOrderAmount;
/**
@@ -66,16 +67,13 @@
*/
@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;
@ApiModelProperty(value = "指定的用户列表id")
@NotNull(message = "指定的用户列表id不能为空")
private List<Long> pointCostomIdList;
-
-
- @ApiModelProperty(value = "领取后有效类型名称")
- private String usageTimeTypeName;
}
--
Gitblit v1.9.3