From 8c6ed6820e53c27fa40973da285fd39a66424540 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 07 五月 2025 14:03:08 +0800
Subject: [PATCH] 提交等保部分功能修改
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserVipDetail.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 577fc54..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
@@ -3,14 +3,17 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -38,10 +41,12 @@
@ApiModelProperty(value = "剩余充电次数")
@TableField("charge_num")
private Integer chargeNum;
-
-
-
- @ApiModelProperty(value = "购买时折扣金额")
+
+ @ApiModelProperty(value = "折扣")
+ @TableField("discount")
+ private BigDecimal discount;
+
+ @ApiModelProperty(value = "最高优惠金额")
@TableField("discount_money")
private BigDecimal discountMoney;
@@ -53,25 +58,47 @@
@TableField("vip_id")
private Integer vipId;
+ @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")
private LocalDateTime startTime;
@ApiModelProperty(value = "会员结束时间")
@TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime endTime;
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
@ApiModelProperty(value = "已赠送的月份")
@TableField("send_month")
private Integer sendMonth;
+ /**
+ * 本月会员优惠到期时间
+ */
+ @TableField("month_end_time")
+ private LocalDateTime monthEndTime;
-
+ @ApiModelProperty(value = "当时购买的vipJson")
+ @TableField("vip_json")
+ private String vipJson;
@ApiModelProperty(value = "要赠送的优惠卷")
@TableField("coupon_ids")
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