From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:02:07 +0800
Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑
---
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 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 9ca0af3..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,11 +1,11 @@
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;
@@ -115,6 +115,8 @@
private BigDecimal prizeScore;
@TableField(exist = false)
private BigDecimal commission;
+ @TableField(exist = false)
+ private BigDecimal totalScore;
@TableField(exist = false)
private BigDecimal amount;
@@ -126,14 +128,18 @@
private String levelName;
/**
- * 董事
+ * 会员等级
*/
private Integer director;
+ @TableField(exist = false)
+ private String directorName;
/**
- * 店长
+ * 分销等级
*/
private Integer storeMaster;
+ @TableField(exist = false)
+ private String storeMasterName;
/**
* 微信用户标识
@@ -167,7 +173,22 @@
@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