From 12916db6e7946a31f4fbc5c48a27e7769683b034 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 23 十月 2023 18:25:02 +0800
Subject: [PATCH] 10.23

---
 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java |   21 +++++++++++++++++++--
 1 files changed, 19 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 2588782..3500554 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;
@@ -28,4 +37,12 @@
     @ApiModelProperty(value = "商品类型  1实物 2课包 3门票 4优惠券")
     private Integer goodType;
 
+
+    private Integer  userId;
+
+    private List<Integer> sid;
+
+    @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
+    private Integer cardType;
+
 }

--
Gitblit v1.7.1