From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 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 0deba36..8425235 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -3,6 +3,7 @@
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 com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -50,7 +51,7 @@
/**
* 性别
*/
- private String sex;
+ private Integer sex;
/**
* 邀请码
@@ -112,6 +113,12 @@
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;
@@ -132,4 +139,51 @@
*/
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