From 41c04c7de3211a2ee53f7e6e53653f8843c52e83 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Wed, 28 Aug 2024 10:50:39 +0800 Subject: [PATCH] 新增功能操作按钮,和更新了数据库数据 --- src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 105 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 91 insertions(+), 14 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 6751a9d..aa87340 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 cn.hutool.core.date.DateTime; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -15,34 +16,29 @@ @ApiModelProperty(value = "id") private Long id; - @ApiModelProperty(value = "昵称") + @ApiModelProperty(value = "登录账号") + private String accountLogin; + + @ApiModelProperty(value = "头像") + private String avatar; + + @ApiModelProperty(value = "用户名") private String name; @ApiModelProperty(value = "手机号") private String phone; - @ApiModelProperty(value = "邮箱") - private String email; - - @ApiModelProperty(value = "性别") - private String sex; - @ApiModelProperty(value = "邀请码") private String inviteId; - @ApiModelProperty(value = "头像") - private String avatar; - - @ApiModelProperty(value = "余额") - private BigDecimal balance; + @ApiModelProperty(value = "代理层级") + private String level; @ApiModelProperty(value = "代理等级") private String levelName; @ApiModelProperty(value = "推荐人昵称") private String referrerName; - - private String level; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createdTime; @@ -54,4 +50,85 @@ 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 = "是否为董事 1-是 2-否") + private Integer director; + + /** + * 董事 + */ + @ApiModelProperty(value = "是否为节点 1-是 2-否") + private Integer partner; + + /** + * 店长 + */ + @ApiModelProperty(value = "是否店长 1-是 2-否") + private Integer storeMaster; + + @ApiModelProperty(value = "内转标识 1:开启 2:关闭") + private Integer insideWith; + + @ApiModelProperty(value = "GFD") + private BigDecimal gsd;//GFD + @ApiModelProperty(value = "静态NFT") + private BigDecimal staticNft;//静态NFT + @ApiModelProperty(value = "动态NFT") + private BigDecimal trendsNft;//动态NFT + @ApiModelProperty(value = "冻结NFT") + private BigDecimal frozenNft;//冻结NFT + @ApiModelProperty(value = "FCM代币可用") + private BigDecimal fcmCntAva;//FCM代币可用 + @ApiModelProperty(value = "FCM代币冻结") + private BigDecimal fcmCntFrozen;//FCM代币冻结 + @ApiModelProperty(value = "令牌可用") + private BigDecimal tokenAva;//令牌可用 + @ApiModelProperty(value = "令牌冻结") + private BigDecimal tokenFrozen;//令牌冻结 + @ApiModelProperty(value = "FCM提现收续费") + private BigDecimal outFcmFee;//FCM提现收续费 + @ApiModelProperty(value = "FCM提现最小数量") + private BigDecimal outFcmMin;//FCM提现收续费 + @ApiModelProperty(value = "NFT提现收续费") + private BigDecimal nftFee;//FCM提现收续费 + @ApiModelProperty(value = "NFT提现最小数量") + private BigDecimal nftMin;//FCM提现收续费 + @ApiModelProperty(value = "FCM价格") + private BigDecimal fcmPrice;//FCM价格 + @ApiModelProperty(value = "预约开始时间") + private String startTime;//FCM价格 + @ApiModelProperty(value = "预约结束时间") + private String endTime;//FCM价格 + @ApiModelProperty(value = "解冻收费FCM") + private BigDecimal unfrozenCnt;//FCM提现收续费 + + @ApiModelProperty(value = "是否冻结 1:是 0 :否") + private Integer isFrozen; + @ApiModelProperty(value = "已排单") + private Integer pickCount; + @ApiModelProperty(value = "支付后,确认倒计时的分钟数,60,为paytime开始计算60分钟的倒计时") + private Integer minuteCnt; + + @ApiModelProperty(value = "收益总额") + private BigDecimal totalPerk; + @ApiModelProperty(value = "卡牌互转手续费") + private String insideNFTPercent; + @ApiModelProperty(value = "充值地址") + private String chargeAddress; + @ApiModelProperty(value = "最小提现金额") + private BigDecimal withdrawAmount; + @ApiModelProperty(value = "USDT价格") + private BigDecimal usdtPrice; + @ApiModelProperty(value = "卡牌互转标识 1-允许 0-拒绝") + private Integer aroundType; + @ApiModelProperty(value = "FDH互转标识 1-允许 0-拒绝") + private Integer aroundCoinType; + @ApiModelProperty(value = "FDH兑换标识 1-允许 0-拒绝") + private Integer changeType; + } -- Gitblit v1.9.1