From 4f5d220cd175b1cb48c6fc91cb02cb12f6114746 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 18 八月 2025 11:10:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
index baec733..db64d76 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java
@@ -4,17 +4,26 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.List;
+
@Data
public class ExchangeDetailsResponse {
@ApiModelProperty(value = "记录id")
- private Integer detailsId;
+ private Long detailsId;
@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=会员赠送)")
+ private Integer exchangeType;
@ApiModelProperty(value = "有效期开始时间")
private String startTime;
@@ -28,4 +37,13 @@
@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