From 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 04 九月 2024 11:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/entity/menber/Member.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/mzl/flower/entity/menber/Member.java b/src/main/java/com/mzl/flower/entity/menber/Member.java
index 04edbf2..6d7de0f 100644
--- a/src/main/java/com/mzl/flower/entity/menber/Member.java
+++ b/src/main/java/com/mzl/flower/entity/menber/Member.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
/**
@@ -19,16 +20,16 @@
public class Member extends BaseAutoEntity {
@ApiModelProperty("会员等级名称")
- private String levelName;
+ private String name;
- @ApiModelProperty("该等级所需的最低成长值")
- private int minGrowthValue;
+ @ApiModelProperty("成长点-区间-开始")
+ private int startPoint;
- @ApiModelProperty("该等级所需的最高成长值")
- private int maxGrowthValue;
+ @ApiModelProperty("成长点-区间-结束")
+ private int endPoint;
@ApiModelProperty("会员折扣类型（百分比、固定金额）")
- private int discountType;
+ private String discountType;
@ApiModelProperty("会员折扣百分比")
private BigDecimal discountRatio;
@@ -40,8 +41,8 @@
private int consumptionAmount;
@ApiModelProperty("已消费产生的成长值")
- private int upGrowthValue;
+ private int growthValue;
@ApiModelProperty("未消费产生的下降值")
- private int downGrowthValue;
+ private int downgradeValue;
}
--
Gitblit v1.9.3