From 9adfc0c5aa084bc61807ce43badf8b9f48b588c3 Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com> Date: 星期四, 05 九月 2024 17:16:16 +0800 Subject: [PATCH] Merge branch 'master' into master-v2 --- src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java b/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java index 9f377eb..a4512be 100644 --- a/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java +++ b/src/main/java/com/mzl/flower/dto/request/menber/MemberDTO.java @@ -3,6 +3,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; @Data @@ -11,32 +12,38 @@ private Long id; @ApiModelProperty("会员等级名称") + @NotNull private String name; @ApiModelProperty("成长点-区间-开始") + @NotNull private int startPoint; @ApiModelProperty("成长点-区间-结束") - private int endPoint; + private Integer endPoint; @ApiModelProperty("会员折扣类型(百分比、固定金额)") - private int discountType; + @NotNull + private String discountType; @ApiModelProperty("会员折扣百分比") + @NotNull private BigDecimal discountRatio; @ApiModelProperty("会员折扣固定金额") + @NotNull private BigDecimal discountAmount; @ApiModelProperty("消费金额(元)") + @NotNull private int consumptionAmount; @ApiModelProperty("已消费产生的成长值") + @NotNull private int growthValue; @ApiModelProperty("未消费产生的下降值") + @NotNull private int downgradeValue; - @ApiModelProperty("成长值规则") - private String growthRule; } -- Gitblit v1.9.3