From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
index 573fca4..b8924ab 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java
@@ -58,30 +58,32 @@
@TableField("vip_id")
private Integer vipId;
- @ApiModelProperty(value = "1月卡2季卡3年卡")
+ @ApiModelProperty(value = "1月卡2季卡3年卡4集团")
@TableField("vip_type")
private Integer vipType;
@ApiModelProperty(value = "会员开始时间")
@TableField("start_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty(value = "会员结束时间")
@TableField("end_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
@TableField("create_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "已赠送的月份")
@TableField("send_month")
private Integer sendMonth;
+ /**
+ * 本月会员优惠到期时间
+ */
+ @TableField("month_end_time")
+ private LocalDateTime monthEndTime;
@ApiModelProperty(value = "当时购买的vipJson")
@TableField("vip_json")
@@ -91,6 +93,11 @@
private String couponIds;
@TableField(exist = false)
private String vipName;
+ @TableField(exist = false)
+ private Integer type;
+
+ @TableField(exist = false)
+ private TVip vip;
--
Gitblit v1.7.1