From cabda12d788eeb6e056113ac8352dfaf972490d9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 17:10:44 +0800
Subject: [PATCH] bug修改,后台新增预约记录，玩湃惠民卡修改二维码参数规则，启动游戏取消校验是否订场校验
---
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 2588782..6c6c1bb 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
@@ -4,6 +4,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.List;
+
@Data
public class ExchangeDetailsResponse {
@@ -13,8 +16,14 @@
@ApiModelProperty(value = "商品名称")
private String goodName;
- @ApiModelProperty(value = "支付类型（积分 / 积分+现金）")
- private String requiredType;
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "现金")
+ private BigDecimal cash;
+
+ @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金 3=现金 4=会员赠送 当该字段为4时 展示的二维码内容增加一个vipDetail:当前数据id)")
+ private Integer exchangeType;
@ApiModelProperty(value = "有效期开始时间")
private String startTime;
@@ -22,10 +31,23 @@
@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 = "1日卡 2月卡 3季卡 4年卡")
+ private Integer cardType;
+
}
--
Gitblit v1.7.1