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/dto/CommissionChangeDto.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/CommissionChangeDto.java b/src/main/java/cc/mrbird/febs/mall/dto/CommissionChangeDto.java
index b88ae41..0062440 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/CommissionChangeDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/CommissionChangeDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
@@ -12,14 +14,15 @@
* @date 2022-05-05
**/
@Data
-@ApiModel(value = "CommissionChangeDto", description = "佣金划转参数接收类")
+@ApiModel(value = "CommissionChangeDto", description = "兑换碳币")
public class CommissionChangeDto {
- @ApiModelProperty(value = "划转金额", example = "100")
- @NotNull(message = "请输入划转金额")
+ @NotNull(message = "参数不能为空")
+ @Min(0)
+ @ApiModelProperty(value = "金额", example = "1")
private BigDecimal amount;
- @ApiModelProperty(value = "类型 1-to余额 2-to竞猜积分", example = "1")
- @NotNull(message = "参数错误")
- private Integer type;
+ @NotBlank(message = "参数不能为空")
+ @ApiModelProperty(value = "交易密码", example = "123456")
+ private String tradePwd;
}
--
Gitblit v1.9.1