From a23b8ac64233af2f436964899b9b81cbab5ef475 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Sun, 26 Sep 2021 14:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8F=91=E5=B8=83=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=A0=A1=E9=AA=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/modules/goods/entity/dos/Category.java   | 8 ++++----
 .../lili/modules/goods/entity/dto/GoodsOperationDTO.java  | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java
index 7146aa80..05e23293 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java
@@ -8,9 +8,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-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.Date;
 
@@ -30,6 +28,7 @@ public class Category extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @NotEmpty(message = "分类名称不能为空")
+    @Size(max = 20)
     @ApiModelProperty(value = "分类名称")
     private String name;
 
@@ -39,14 +38,15 @@ public class Category extends BaseEntity {
 
     @NotNull(message = "层级不能为空")
     @Min(value = 0,message = "层级需要大于0")
+    @Max(value = 3,message = "层级最大为3")
     @ApiModelProperty(value = "层级, 从0开始")
     private Integer level;
 
     @NotNull(message = "排序值不能为空")
+    @Max(value = 999,message = "排序值最大999")
     @ApiModelProperty(value = "排序值")
     private BigDecimal sortOrder;
 
-    @NotNull(message = "请填写佣金比例")
     @ApiModelProperty(value = "佣金比例")
     private Double commissionRate;
 
diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
index 300b7400..434948d2 100644
--- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
+++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
@@ -7,10 +7,7 @@ import lombok.ToString;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.Valid;
-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.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -40,8 +37,7 @@ public class GoodsOperationDTO implements Serializable {
     private String categoryPath;
 
     @ApiModelProperty(value = "店铺分类id", required = true)
-    @NotNull(message = "店铺分类不能为空")
-    @Min(value = 0, message = "店铺分类值不正确")
+    @Size(max = 200, message = "选择了太多店铺分类")
     private String storeCategoryPath;
 
     @ApiModelProperty(value = "品牌id")