From 664184af3e070dee665ee736caffa0297804975f Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 18 Mar 2025 11:46:02 +0800
Subject: [PATCH] perf(mall): 移除会员利润计算中的异步执行

---
 src/main/java/cc/mrbird/febs/mall/entity/MallMember.java |   72 ++++++++++++++++++++++++++++++++++--
 1 files changed, 68 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 61a5590..ae6fecc 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,13 +126,76 @@
     private String levelName;
 
     /**
-     * 董事
+     * 是否是节点 1是 0否
      */
     private Integer director;
+    //升级为节点的时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date directorTime;
 
     /**
      * 店长
      */
     private Integer storeMaster;
 
+    /**
+     * 微信用户标识
+     */
+    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;
+
+    //升级为会员的时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date vipLevelTime;
+
+    @TableField(exist = false)
+    private int directCnt = 0;
+
+    @TableField(exist = false)
+    private int directCntAvailable = 0;
+    @TableField(exist = false)
+    private int teamCnt = 0;
+    @TableField(exist = false)
+    private BigDecimal achieveCnt = BigDecimal.ZERO;
 }

--
Gitblit v1.9.1