From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +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/ProductDetailsVo.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
index 52e811f..cce4217 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
@@ -19,7 +19,7 @@
@ApiModelProperty(value = "商品名称")
private String goodName;
- @ApiModelProperty(value = "适用人群")
+ @ApiModelProperty(value = "适用人群（1=全部用户，2=年度会员，3=已有学员用户）")
private Integer belongsScope;
@ApiModelProperty(value = "已兑换数量")
@@ -31,8 +31,14 @@
@ApiModelProperty(value = "每人限额")
private Integer perLimit;
- @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 BigDecimal cost;
@@ -52,7 +58,13 @@
@ApiModelProperty(value = "兑换说明")
private String contents;
+ @ApiModelProperty(value = "兑换地点类型 1=全国 2=指定城市 3指定门店")
+ private Integer exchangeAddrType;
+
@ApiModelProperty(value = "商品类型 1实物 2课包 3门票 4优惠券")
private Integer goodType;
+ @ApiModelProperty(value = "1日卡 2月卡 3季卡 4年卡")
+ private Integer cardType;
+
}
--
Gitblit v1.7.1