From ca19af1898405b969d2d9e8a3d07f9b1ee7fc938 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 02 Jul 2023 11:24:04 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 158 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index 4766a06..0b660ab 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -2,46 +2,201 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.BaseEntity;
+import cc.mrbird.febs.common.entity.BaseEntity;
+import cc.mrbird.febs.common.enumerates.MemberLevelTagDicEnums;
+import cc.mrbird.febs.mall.excel.LevelConverter;
+import cc.mrbird.febs.mall.excel.SexConverter;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
+
+import java.math.BigDecimal;
/**
* @author wzy
* @date 2021-09-16
**/
@Data
+@ExcelIgnoreUnannotated
@TableName("mall_member")
public class MallMember extends BaseEntity {
+ /**
+ * 姓名
+ */
+ @ExcelProperty(value = "姓名")
private String name;
+ /**
+ * 手机号
+ */
+ @ExcelProperty(value = "手机号")
private String phone;
+ /**
+ * 邮箱
+ */
private String email;
+ /**
+ * 密码
+ */
private String password;
- private String sex;
+ /**
+ * 资金密码
+ */
+ private String tradePassword;
+ /**
+ * 头像
+ */
+ private String avatar;
+
+ /**
+ * 性别
+ */
+ @ExcelProperty(value = "性别", converter = SexConverter.class)
+ private Integer sex;
+
+ /**
+ * 邀请码
+ */
+ @ExcelProperty(value = "邀请码")
private String inviteId;
+ /**
+ * 父级邀请码
+ */
+ @ExcelProperty(value = "父级邀请码")
private String referrerId;
+ @ExcelProperty(value = "父级名称")
+ @TableField(exist = false)
+ private String referrerName;
+
+ /**
+ * 邀请码链
+ */
private String referrerIds;
+ /**
+ * 代理级别
+ */
+ @ExcelProperty(value = "会员级别", converter = LevelConverter.class)
private String level;
/**
* 账户状态;1-正常 2-禁用
*/
private Integer accountStatus;
- public static final int ACCOUNTSTATUS_Y = 1;
- public static final int ACCOUNTSTATUS_N = 2;
+ /**
+ * 启用
+ */
+ public static final Integer ACCOUNT_STATUS_ENABLE = 1;
+ /**
+ * 禁用
+ */
+ public static final Integer ACCOUNT_STATUS_DISABLED = 2;
+ /**
+ * 账号类型
+ */
private Integer accountType;
+ /**
+ * 正常账号
+ */
+ public static final Integer ACCOUNT_TYPE_NORMAL = 1;
+ /**
+ * 测试账号
+ */
+ public static final Integer ACCOUNT_TYPE_TEST = 2;
@TableField(exist = false)
private String account;
+ private String bindPhone;
+
+ @ExcelProperty(value = "金额")
+ @TableField(exist = false)
+ private BigDecimal balance;
+ @TableField(exist = false)
+ private BigDecimal score;
+ @TableField(exist = false)
+ private BigDecimal prizeScore;
+ @TableField(exist = false)
+ private BigDecimal commission;
+ @TableField(exist = false)
+ private Integer star;
+ @TableField(exist = false)
+ private BigDecimal totalScore;
+
+ @TableField(exist = false)
+ private BigDecimal amount;
+
+ @TableField(exist = false)
+ private String query;
+
+ @TableField(exist = false)
+ private String levelName;
+
+ /**
+ * 董事
+ */
+ private Integer director;
+
+ /**
+ * 店长
+ */
+ private Integer storeMaster;
+
+ /**
+ * 联创 1-是 2-否
+ */
+ private Integer creater;
+
+ /**
+ * 合伙人 1-是 2-否
+ */
+ private Integer partner;
+ /**
+ * 绿色凭证
+ */
+ @TableField(exist = false)
+ private BigDecimal voucherCnt;
+ /**
+ * 凭证现金
+ */
+ @TableField(exist = false)
+ private BigDecimal voucherAmount;
+
+ /*
+ * 内转标识 1：开启 2：关闭
+ */
+ private Integer insideWith;
+
+ /**
+ * 账号级别 1-会员 2-代理 3-股东
+ */
+ private Integer accountLevel;
+
+ /**
+ * 伞下数量
+ */
+ private Integer childNodeCnt;
+
+ private String skin;
+
+ public String getLevelName() {
+ if (sex != null) {
+ return MemberLevelTagDicEnums.getDesc(sex, level);
+ }
+
+ return null;
+ }
+
+ @TableField(exist = false)
+ private Integer type;
}
--
Gitblit v1.9.1