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 | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 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 731c1a4..0b660ab 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,11 @@ 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; @@ -14,17 +19,20 @@ * @date 2021-09-16 **/ @Data +@ExcelIgnoreUnannotated @TableName("mall_member") public class MallMember extends BaseEntity { /** * 姓名 */ + @ExcelProperty(value = "姓名") private String name; /** * 手机号 */ + @ExcelProperty(value = "手机号") private String phone; /** @@ -50,17 +58,24 @@ /** * 性别 */ + @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; /** * 邀请码链 @@ -70,6 +85,7 @@ /** * 代理级别 */ + @ExcelProperty(value = "会员级别", converter = LevelConverter.class) private String level; /** @@ -103,9 +119,7 @@ private String bindPhone; - @TableField(exist = false) - private String referrerName; - + @ExcelProperty(value = "金额") @TableField(exist = false) private BigDecimal balance; @TableField(exist = false) @@ -174,4 +188,15 @@ 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