From 9486766c806fe1d9e082b2fd02ea1cc558f1b443 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 五月 2025 09:21:57 +0800
Subject: [PATCH] bug修改

---
 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java |   26 +++++++++++++++++++++++---
 1 files changed, 23 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..b1390ef 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=积分+现金)")
+    private Integer exchangeType;
 
     @ApiModelProperty(value = "有效期开始时间")
     private String startTime;
@@ -22,10 +31,21 @@
     @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