From e8f01399a49bb718f184e31d0f6de27c3dc64cef Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 19 八月 2025 08:58:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
index 24e25a1..81d9384 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@Data
public class ExchangeDetailsResponse {
@@ -21,7 +22,7 @@
@ApiModelProperty(value = "现金")
private BigDecimal cash;
- @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=会员赠送)")
private Integer exchangeType;
@ApiModelProperty(value = "有效期开始时间")
@@ -30,10 +31,25 @@
@ApiModelProperty(value = "有效期结束时间")
private String endTime;
- @ApiModelProperty(value = "使用状态 （1已使用 2未使用）")
+ @ApiModelProperty(value = "使用状态 （1已使用 2未使用 3 已过期）")
private Integer useStatus;
@ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券")
private Integer goodType;
+
+ private Integer userId;
+
+
+ private List<Integer> rid;
+
+ private List<Integer> sid;
+
+ @ApiModelProperty(value = "当exchangeType=3会员赠送时存储1 门票二维码格式内容新增该字段 用于标明该门票为会员赠送" +
+ "，使用时存储门票记录")
+ private Integer isVipCode;
+
+ @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
+ private Integer cardType;
+
}
--
Gitblit v1.7.1