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/entity/MallRefundEntity.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java b/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java index 16e8be2..dae67f7 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallRefundEntity.java @@ -3,9 +3,11 @@ import cc.mrbird.febs.common.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.math.BigDecimal; +import java.util.Date; @Data @TableName("mall_refund") @@ -48,4 +50,18 @@ @TableField(exist = false) private String[] refundPicList; + @TableField(exist = false) + private String refundMemberName; + @TableField(exist = false) + private String refundMemberPhone; + + @TableField(exist = false) + private String leaderName; + @TableField(exist = false) + private String leaderPhone; + + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date orderTime; + } -- Gitblit v1.9.1