From 626feb32d22db5762a63ab56b079ee6cbefa4d86 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 15:49:04 +0800
Subject: [PATCH] refactor(mall): 优化会员信息接口返回内容
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 95 +++++++++++------------------------------------
1 files changed, 22 insertions(+), 73 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 59c4080..4745bd3 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,10 @@
package cc.mrbird.febs.mall.vo;
-import cc.mrbird.febs.vip.entity.MallVipConfig;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -15,88 +15,37 @@
@ApiModelProperty(value = "id")
private Long id;
-
@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 = "代理等级")
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+ @ApiModelProperty(value = "邀请码（如果是团长，邀请码就是团长特征码）")
+ private String inviteId;
+ @ApiModelProperty(value = "VIP等级图片")
+ private String levelPng;
+ @ApiModelProperty(value = "VIP等级名称")
private String levelName;
-
- @ApiModelProperty(value = "推荐人昵称")
- private String referrerName;
-
+ @ApiModelProperty(value = "VIP等级编码")
private String level;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createdTime;
+ @ApiModelProperty(value = "是否允许碳积分兑换碳币 1是0否")
+ private Integer changeState;//是否允许碳积分兑换碳币 1是0否
+ @ApiModelProperty(value = "是否允许碳币提现 1是0否")
+ private Integer withdrawState;//是否允许碳币提现 1是0否
- /**
- * 账户状态;1-正常 2-禁用
- */
- private Integer accountStatus;
- 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 = "赠送积分")
+ @ApiModelProperty(value = "碳币")
+ private BigDecimal balance;
+ @ApiModelProperty(value = "碳积分")
private BigDecimal score;
- @ApiModelProperty(value = "抽奖积分")
- private BigDecimal prizeScore;
+ @ApiModelProperty(value = "是否有支付密码 1:是 0：否")
+ private Integer tradeWord;
- @ApiModelProperty(value = "是否是团长 1: 是 2：否")
- private Integer isTeamLeader;
+ @ApiModelProperty(value = "会员到期时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date vipLevelTime;
- @ApiModelProperty(value = "是否是代理 1: 申请中 2：是 3：否")
- private Integer isAgent;
-
- @ApiModelProperty(value = "代理名称")
- private String agentLevelName;
-
- @ApiModelProperty(value = "代理等级数字 1：一级 2：二级 3：三级")
- private Integer agentLevel;
-
- @ApiModelProperty(value = "收藏数量")
- private Integer collectionCnt;
-
- @ApiModelProperty(value = "足迹数量")
- private Integer footprintCnt;
-
- @ApiModelProperty(value = "足迹数量")
- private Integer childCnt;
-
- @ApiModelProperty(value = "是否是推销员")
- private Integer isSale;
-
- @ApiModelProperty(value = "会员信息")
- private MallVipConfig vipInfo;
}
--
Gitblit v1.9.1