From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/PointDetailsVo.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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..27f6e7f 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 {
@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