From 3fb300fe477e128976b1583ebc1a57aae372c645 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Dec 2024 17:37:44 +0800
Subject: [PATCH] refactor(mallMember): 注释掉会员列表中的到期时间字段 - 在 mallMemberList.html 文件中，添加了对 '到期时间' 字段的注释 -此修改可能是为了暂时移除或隐藏该字段的显示
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 0f110ab..f564d01 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -1,13 +1,14 @@
package cc.mrbird.febs.mall.entity;
-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 com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.util.Date;
/**
* @author wzy
@@ -83,7 +84,7 @@
/**
* 禁用
*/
- public static final Integer ACCOUNT_STATUS_DISABLED = 2;
+ public static final Integer ACCOUNT_STATUS_DISABLED = 0;
/**
* 账号类型
@@ -125,9 +126,13 @@
private String levelName;
/**
- * 董事
+ * 是否是节点 1是 0否
*/
private Integer director;
+ //升级为节点的时间
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date directorTime;
/**
* 店长
@@ -155,4 +160,32 @@
private String salesmansName;
private String inviteImg;
+ //是否是推销员1:是 2：否
+ private Integer isSale;
+
+ //优惠卷名称
+ @TableField(exist = false)
+ private String couponName;
+
+ //优惠卷名称
+ @TableField(exist = false)
+ private Long couponId;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date birthday;
+
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date birthdayQuery;
+
+ private String realName;
+
+ private Date lastLoginTime;
+
+ //升级为会员的时间
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date vipLevelTime;
}
--
Gitblit v1.9.1