From c33c9c03bb90e49ad12fd237058c877e87e96ca4 Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Mon, 24 Apr 2023 00:17:41 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 54 insertions(+), 2 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 a51685b..926df29 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java @@ -1,10 +1,12 @@ 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; import lombok.Data; +import java.math.BigDecimal; import java.util.Date; @Data @@ -24,7 +26,7 @@ private String email; @ApiModelProperty(value = "性别") - private String sex; + private Integer sex; @ApiModelProperty(value = "邀请码") private String inviteId; @@ -33,11 +35,12 @@ private String avatar; @ApiModelProperty(value = "余额") - private String balance; + private BigDecimal balance; @ApiModelProperty(value = "代理等级") private String levelName; + @ApiModelProperty(value = "推荐人昵称") private String referrerName; private String level; @@ -52,4 +55,53 @@ public static final int ACCOUNTSTATUS_Y = 1; public static final int ACCOUNTSTATUS_N = 2; + @ApiModelProperty(value = "是否设置收款方式", example = "1是2否") + private Integer hasPayment = 2; + + @ApiModelProperty(value = "是否设置交易密码", example = "1是2否") + private Integer hasTradePwd = 2; + + @ApiModelProperty(value = "绑定手机号") + private String bindPhone; + + @ApiModelProperty(value = "累计消费") + private BigDecimal totalCost; + + @ApiModelProperty(value = "赠送积分") + private BigDecimal score; + + @ApiModelProperty(value = "抽奖积分") + private BigDecimal prizeScore; + + /** + * 董事 + */ + @ApiModelProperty(value = "是否为董事 1-是 2-否") + private Integer director; + + /** + * 店长 + */ + @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; + + public String getLevelName() { + if (sex != null) { + return MemberLevelTagDicEnums.getDesc(sex, level); + } + + return null; + } } -- Gitblit v1.9.1