From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 1080ba8..5d52e27 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import cc.mrbird.febs.common.enumerates.MemberLevelTagDicEnums;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -25,7 +26,7 @@
private String email;
@ApiModelProperty(value = "性别")
- private String sex;
+ private Integer sex;
@ApiModelProperty(value = "邀请码")
private String inviteId;
@@ -84,4 +85,26 @@
@ApiModelProperty(value = "是否店长 1-是 2-否")
private Integer storeMaster;
+ @ApiModelProperty(value = "补贴额度")
+ private BigDecimal totalScore;
+
+ @ApiModelProperty(value = "贡献点")
+ private Integer star;
+
+ @ApiModelProperty(value = "凭证数量")
+ private BigDecimal voucherCnt;
+
+ @ApiModelProperty(value = "内转标识 1：开启 2：关闭")
+ private Integer insideWith;
+
+ @ApiModelProperty(value = "是否可以邀请")
+ private Integer canInvite;
+
+ public String getLevelName() {
+ if (sex != null) {
+ return MemberLevelTagDicEnums.getDesc(sex, level);
+ }
+
+ return null;
+ }
}
--
Gitblit v1.9.1