caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

Browse Source
This commit is contained in:
paulGao 2021-09-26 17:13:54 +08:00
commit c8b2e87570
4 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DB/version4.2.2to4.2.3.sql
View File

@ -1,2 +1,2 @@
/** 新增会员获的总积分 **/ /** 新增店铺客服字段 **/
ALTER TABLE li_store ADD merchant_euid varchar(255) COMMENT '客服标识'; ALTER TABLE li_store ADD merchant_euid varchar(255) COMMENT '客服标识';

8
framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java
View File

@ -8,9 +8,7 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.validation.constraints.Min; import javax.validation.constraints.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -30,6 +28,7 @@ public class Category extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@NotEmpty(message = "分类名称不能为空") @NotEmpty(message = "分类名称不能为空")
@Size(max = 20)
@ApiModelProperty(value = "分类名称") @ApiModelProperty(value = "分类名称")
private String name; private String name;
@ -39,14 +38,15 @@ public class Category extends BaseEntity {
@NotNull(message = "层级不能为空") @NotNull(message = "层级不能为空")
@Min(value = 0,message = "层级需要大于0") @Min(value = 0,message = "层级需要大于0")
@Max(value = 3,message = "层级最大为3")
@ApiModelProperty(value = "层级, 从0开始") @ApiModelProperty(value = "层级, 从0开始")
private Integer level; private Integer level;
@NotNull(message = "排序值不能为空") @NotNull(message = "排序值不能为空")
@Max(value = 999,message = "排序值最大999")
@ApiModelProperty(value = "排序值") @ApiModelProperty(value = "排序值")
private BigDecimal sortOrder; private BigDecimal sortOrder;
@NotNull(message = "请填写佣金比例")
@ApiModelProperty(value = "佣金比例") @ApiModelProperty(value = "佣金比例")
private Double commissionRate; private Double commissionRate;

8
framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
View File

@ -7,10 +7,7 @@ import lombok.ToString;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.Max; import javax.validation.constraints.*;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -40,8 +37,7 @@ public class GoodsOperationDTO implements Serializable {
private String categoryPath; private String categoryPath;
@ApiModelProperty(value = "店铺分类id", required = true) @ApiModelProperty(value = "店铺分类id", required = true)
@NotNull(message = "店铺分类不能为空") @Size(max = 200, message = "选择了太多店铺分类")
@Min(value = 0, message = "店铺分类值不正确")
private String storeCategoryPath; private String storeCategoryPath;
@ApiModelProperty(value = "品牌id") @ApiModelProperty(value = "品牌id")

10
framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java
View File

@ -9,7 +9,10 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
/** /**
* 文章分类 * 文章分类
@ -35,10 +38,15 @@ public class ArticleCategory extends BaseEntity {
@ApiModelProperty(value = "父分类ID") @ApiModelProperty(value = "父分类ID")
private String parentId; private String parentId;
@ApiModelProperty(value = "排序，正序123") @ApiModelProperty(value = "排序")
@Min(value = 0,message = "排序值最小0，最大9999999999")
@Max(value = 999999999,message = "排序值最小0，最大9999999999")
@NotNull(message = "排序值不能为空")
private Integer sort; private Integer sort;
@ApiModelProperty(value = "层级") @ApiModelProperty(value = "层级")
@Min(value = 0,message = "层级最小为0")
@Max(value = 3,message = "层级最大为3")
private Integer level; private Integer level;
/** /**