From ca4cfb6e80c47be9fcb3a3e1d4575cf2ed9f1f62 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 03 Jan 2025 22:38:36 +0800
Subject: [PATCH] fix(mall): 修复余额不足时的支付异常
---
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 f23b060..b00ba0c 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;
@@ -84,7 +84,7 @@
/**
* 禁用
*/
- public static final Integer ACCOUNT_STATUS_DISABLED = 2;
+ public static final Integer ACCOUNT_STATUS_DISABLED = 0;
/**
* 账号类型
@@ -126,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;
/**
* 店长
@@ -167,11 +171,28 @@
@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 teamCnt = 0;
+ @TableField(exist = false)
+ private BigDecimal achieveCnt = BigDecimal.ZERO;
}
--
Gitblit v1.9.1