From a78782b361c2bd038cdf30d8533f9e3926065d4a Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期五, 22 八月 2025 09:17:16 +0800 Subject: [PATCH] update --- cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 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 a2ac377..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 @@ -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=现金 4=会员赠送 当该字段为4时 展示的二维码内容增加一个vipDetail:当前数据id)") private Integer exchangeType; @ApiModelProperty(value = "有效期开始时间") @@ -30,15 +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 Integer userId; - private Integer sid; + + private List<Integer> rid; + + private List<Integer> sid; + + + + @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡") + private Integer cardType; } -- Gitblit v1.7.1