From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java
index 237c23d..66df3ba 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java
@@ -4,13 +4,14 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
-public class PointDetailsVo {
+public class PointDetailsVo {
@ApiModelProperty(value = "记录id")
- private Integer detailsId;
+ private Long detailsId;
@ApiModelProperty(value = "图片集")
private List<String> pics;
@@ -18,7 +19,7 @@
@ApiModelProperty(value = "商品名称")
private String goodName;
- @ApiModelProperty(value = "适用状态（1已使用 2未使用）")
+ @ApiModelProperty(value = "适用状态（1已使用 2未使用 3已过期）")
private Integer useType;
@ApiModelProperty(value = "有效期开始时间")
@@ -42,4 +43,24 @@
@ApiModelProperty(value = "兑换说明")
private String contents;
+ @ApiModelProperty(value = "课包课时数")
+ private Integer classHours;
+
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "现金")
+ private BigDecimal cash;
+
+ @ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券")
+ private Integer goodType;
+
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
+ private Integer exchangeType;
+
+ @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
+ private Integer cardType;
+
+ @ApiModelProperty(value = "使用范围")
+ private Integer exchangeAddrType;
}
--
Gitblit v1.7.1