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/vip/entity/MallVipConfig.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/entity/MallVipConfig.java b/src/main/java/cc/mrbird/febs/vip/entity/MallVipConfig.java
index dd665f1..c9670a3 100644
--- a/src/main/java/cc/mrbird/febs/vip/entity/MallVipConfig.java
+++ b/src/main/java/cc/mrbird/febs/vip/entity/MallVipConfig.java
@@ -1,26 +1,42 @@
package cc.mrbird.febs.vip.entity;
import cc.mrbird.febs.common.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.List;
+
@Data
+@ApiModel(value = "MallVipConfig")
@TableName("mall_vip_config")
public class MallVipConfig extends BaseEntity {
+
/**
* 会员名称
*/
+ @ApiModelProperty(value = "名称")
private String name;
/**
* 主图
*/
+ @ApiModelProperty(value = "主图")
private String thumb;
+
+ /**
+ * 会员编码
+ */
+ private String code;
/**
* 等级
*/
+ @ApiModelProperty(value = "会员等级")
private Integer level;
/**
@@ -41,7 +57,7 @@
/**
* 消费金额
*/
- private Double amount;
+ private BigDecimal amount;
/**
* 指定月数
@@ -52,4 +68,16 @@
* 指定商品ID
*/
private Long targetId;
+
+ @TableField(exist = false)
+ private String targetName;
+
+ @TableField(exist = false)
+ private List<MallVipBenefits> benefits;
+
+ @TableField(exist = false)
+ private String benefitsIds;
+
+ @TableField(exist = false)
+ private List<Long> benefitsIdList;
}
--
Gitblit v1.9.1