From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 19 Dec 2024 17:50:05 +0800 Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑,使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义,确保数据展示正确 - 更新 buyVipList.html 中状态颜色,以更直观地显示不同状态 --- src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCouponVo.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCouponVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCouponVo.java index 09628ee..e6872f5 100644 --- a/src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCouponVo.java +++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminMallGoodsCouponVo.java @@ -5,6 +5,7 @@ import javax.validation.constraints.*; import java.math.BigDecimal; +import java.util.List; @Data @ApiModel(value = "AdminMallGoodsCouponVo", description = "信息返回类") @@ -17,6 +18,7 @@ @NotNull(message = "过期天数不能为空") @Min(value = 0, message = "整数字段不能小于0") private Integer expireDay; + private Integer type; //满1000减100,满0减50; //满足金额 @NotNull(message = "满足金额不能为空") @@ -28,4 +30,6 @@ @DecimalMin(value = "0", inclusive = false, message = "字段不能小于0") @DecimalMax(value = "10000", inclusive = false, message = "字段不能大于10000") private BigDecimal realAmount; + + private List<Long> goodsIds; } -- Gitblit v1.9.1