From 2ae7d73e29010a1f1b43c3b71f6789c16c2c3128 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 14:39:09 +0800
Subject: [PATCH] fix(mall): 修复完善信息赠送新人礼逻辑
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 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 af98c35..a942f25 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -1,8 +1,14 @@
package cc.mrbird.febs.mall.entity;
-import cc.mrbird.febs.common.controller.BaseController;
+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
@@ -10,28 +16,179 @@
**/
@Data
@TableName("mall_member")
-public class MallMember extends BaseController {
+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 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 totalScore;
+
+ @TableField(exist = false)
+ private BigDecimal amount;
+
+ @TableField(exist = false)
+ private String query;
+
+ @TableField(exist = false)
+ private String levelName;
+
+ /**
+ * 会员等级
+ */
+ private Integer director;
+ @TableField(exist = false)
+ private String directorName;
+
+ /**
+ * 分销等级
+ */
+ private Integer storeMaster;
+ @TableField(exist = false)
+ private String storeMasterName;
+
+ /**
+ * 微信用户标识
+ */
+ private String openId;
+
+ /**
+ * 会话密钥
+ */
+ private String sessionKey;
+
+ //团长申请状态 1：审核通过 2：审核不通过 3：申请中
+ @TableField(exist = false)
+ private Integer leaderState;
+
+ private Long salesmansId;
+
+ //推销员姓名
+ @TableField(exist = false)
+ 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;
+
+ private Date vipLevelTime;
+ //是否是医生 0-否 1-是
+ private Integer doctorState;
+ //是否是核销员 0-否 1-是
+ private Integer checkOrder;
}
--
Gitblit v1.9.1