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/response/member/MemberVO.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/member/MemberVO.java b/src/main/java/com/mzl/flower/dto/response/member/MemberVO.java
index bebe4e7..8535b30 100644
--- a/src/main/java/com/mzl/flower/dto/response/member/MemberVO.java
+++ b/src/main/java/com/mzl/flower/dto/response/member/MemberVO.java
@@ -1,4 +1,53 @@
package com.mzl.flower.dto.response.member;
-public class MemberVO {
+import com.mzl.flower.base.AbstractTransDTO;
+import com.mzl.flower.base.annotation.DictTrans;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class MemberVO extends AbstractTransDTO {
+ private Long id;
+
+ @ApiModelProperty("会员等级名称")
+ private String name;
+
+ @ApiModelProperty("成长点-区间-开始")
+ private int startPoint;
+
+ @ApiModelProperty("成长点-区间-结束")
+ private int endPoint;
+
+ @ApiModelProperty("会员折扣类型（百分比、固定金额）")
+ @DictTrans(target = "discountTypeStr", codeType = "DISCOUNT_TYPE")
+ private String discountType;
+
+ private String discountTypeStr;
+
+ @ApiModelProperty("会员折扣百分比")
+ private BigDecimal discountRatio;
+
+ @ApiModelProperty("会员折扣固定金额")
+ private BigDecimal discountAmount;
+
+ @ApiModelProperty("消费金额（元）")
+ private int consumptionAmount;
+
+ @ApiModelProperty("已消费产生的成长值")
+ private int growthValue;
+
+ @ApiModelProperty("未消费产生的下降值")
+ private int downgradeValue;
+
+ @ApiModelProperty("创建日期")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("修改日期")
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("操作人")
+ private String createName;
}
--
Gitblit v1.9.3