From 48bb23486bc018d13014d8acde4fb51ec3a78a36 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 24 Sep 2022 11:27:59 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 106 insertions(+), 2 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..a5c5710 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -2,9 +2,12 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.BaseEntity;
+import cc.mrbird.febs.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
+
+import java.math.BigDecimal;
/**
* @author wzy
@@ -14,34 +17,135 @@
@TableName("mall_member")
public class MallMember extends BaseEntity {
+ /**
+ * 姓名
+ */
private String name;
+ /**
+ * 手机号
+ */
private String phone;
+ /**
+ * 邮箱
+ */
private String email;
+ /**
+ * 密码
+ */
private String password;
+ /**
+ * 资金密码
+ */
+ private String tradePassword;
+
+ /**
+ * 头像
+ */
+ private String avatar;
+
+ /**
+ * 性别
+ */
private String sex;
+ /**
+ * 邀请码
+ */
private String inviteId;
+ /**
+ * 父级邀请码
+ */
private String referrerId;
+ /**
+ * 邀请码链
+ */
private String referrerIds;
+ /**
+ * 代理级别
+ */
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;
+
+ @TableField(exist = false)
+ private String referrerName;
+
+ @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 BigDecimal amount;
+
+ @TableField(exist = false)
+ private String query;
+
+ @TableField(exist = false)
+ private String levelName;
+
+ /**
+ * 董事
+ */
+ private Integer director;
+
+ /**
+ * 店长
+ */
+ private Integer storeMaster;
+
+ /**
+ * 微信用户标识
+ */
+ private String openId;
+
+ /**
+ * 会话密钥
+ */
+ private String sessionKey;
+
+ //团长申请状态 1：审核通过 2：审核不通过 3：申请中
+ @TableField(exist = false)
+ private Integer leaderState;
+
}
--
Gitblit v1.9.1