From 59b5c5cdcdfcf29537a53b90aa01331cb8894792 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 10 Jan 2025 12:59:06 +0800
Subject: [PATCH] refactor(mall): 优化活动列表展示和商品添加功能
---
src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java b/src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java
index 57a3792..f5f9200 100644
--- a/src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java
+++ b/src/main/java/cc/mrbird/febs/vip/entity/MallVipBenefitsRecord.java
@@ -1,8 +1,11 @@
package cc.mrbird.febs.vip.entity;
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.util.Date;
@@ -10,7 +13,18 @@
@TableName(value = "mall_vip_benefits_record")
public class MallVipBenefitsRecord extends BaseEntity {
- private String memberId ;
+ @TableField(exist = false)
+ private String memberName;
+
+ @TableField(exist = false)
+ private String memberPhone;
+
+ @DateTimeFormat(pattern = "MM-dd")
+ @JsonFormat(pattern = "MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date birthday;
+
+ private Long memberId ;
/** 权益名称 */
private String benefitsName ;
/** 权益类型; 1-会员日 2-生日 */
@@ -20,9 +34,39 @@
/** 领取数量 */
private Integer receiveCnt ;
/** 领取时间 */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date receiveTime ;
/** 领取类型;2-商品 3-优惠券 */
private Integer receiveType ;
/** 领取ID */
private Long receiveId ;
+
+ private Integer status;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date birthdayStart;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date birthdayEnd;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date receiveStartTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @TableField(exist = false)
+ private Date receiveEndTime;
+
+ @TableField(exist = false)
+ private String levelName;
+
+ @TableField(exist = false)
+ private String hasReceive;
}
--
Gitblit v1.9.1