From 50dfdaf4e3220e7c1f93a189879ea92bb8f46b4c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 六月 2025 17:58:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
index 3c75e76..93d41af 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -8,6 +9,7 @@
import lombok.EqualsAndHashCode;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -40,7 +42,7 @@
@ApiModelProperty(value = "月卡价格")
@TableField("monthly_card")
- private Double monthlyCard;
+ private BigDecimal monthlyCard;
@ApiModelProperty(value = "月卡显示（0=否，1=是）")
@TableField("monthly_card_reveal")
@@ -48,14 +50,16 @@
@ApiModelProperty(value = "月卡折扣")
@TableField("monthly_card_discount")
- private Double monthlyCardDiscount;
+ private BigDecimal monthlyCardDiscount;
@ApiModelProperty(value = "月卡折扣开始时间")
@TableField("monthly_card_discount_start")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime monthlyCardDiscountStart;
@ApiModelProperty(value = "月卡折扣结束时间")
@TableField("monthly_card_discount_end")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime monthlyCardDiscountEnd;
@ApiModelProperty(value = "月卡折扣显示（0=否，1=是）")
@@ -64,7 +68,7 @@
@ApiModelProperty(value = "季卡价格")
@TableField("season_card")
- private Double seasonCard;
+ private BigDecimal seasonCard;
@ApiModelProperty(value = "季卡显示（0=否，1=是）")
@TableField("season_card_reveal")
@@ -72,14 +76,16 @@
@ApiModelProperty(value = "季卡折扣")
@TableField("season_card_discount")
- private Double seasonCardDiscount;
+ private BigDecimal seasonCardDiscount;
@ApiModelProperty(value = "季卡折扣开始时间")
@TableField("season_card_discount_start")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime seasonCardDiscountStart;
@ApiModelProperty(value = "季卡折扣结束时间")
@TableField("season_card_discount_end")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime seasonCardDiscountEnd;
@ApiModelProperty(value = "季卡折扣显示（0=否，1=是）")
@@ -88,7 +94,7 @@
@ApiModelProperty(value = "年卡价格")
@TableField("annual_card")
- private Double annualCard;
+ private BigDecimal annualCard;
@ApiModelProperty(value = "年卡显示（0=否，1=是）")
@TableField("annual_card_reveal")
@@ -96,14 +102,16 @@
@ApiModelProperty(value = "年卡折扣")
@TableField("annual_card_discount")
- private Double annualCardDiscount;
+ private BigDecimal annualCardDiscount;
@ApiModelProperty(value = "年卡折扣开始时间")
@TableField("annual_card_discount_start")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime annualCardDiscountStart;
@ApiModelProperty(value = "年卡折扣结束时间")
@TableField("annual_card_discount_end")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime annualCardDiscountEnd;
@ApiModelProperty(value = "年卡折扣显示（0=否，1=是）")
@@ -116,7 +124,7 @@
@ApiModelProperty(value = "最高抵扣金额")
@TableField("maximum_deduction")
- private Double maximumDeduction;
+ private BigDecimal maximumDeduction;
@ApiModelProperty(value = "抵扣类型（1=服务费）")
@TableField("deduction_type")
@@ -133,15 +141,16 @@
@ApiModelProperty(value = "商城专享价开关（0=否，1=是）")
@TableField("mall_exclusive_price")
private Integer mallExclusivePrice;
+ @ApiModelProperty(value = "内部会员折扣")
+ @TableField("discount")
+ private BigDecimal discount;
+ @ApiModelProperty(value = "添加的会员类型 1常规 2内部")
+ @TableField("type")
+ private Integer type;
- @ApiModelProperty(value = "添加时间")
- @TableField("create_time")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "删除（0=否，1=是）")
- @TableField("del_flag")
- @TableLogic
- private Integer delFlag;
+ @ApiModelProperty(value = "优惠券名称和张数 后台列表展示使用")
+ @TableField(exist = false)
+ private String couponName;
}
--
Gitblit v1.7.1