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/MallMemberWithdraw.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java index 70a2624..702e470 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberWithdraw.java @@ -1,25 +1,24 @@ package cc.mrbird.febs.mall.entity; import cc.mrbird.febs.common.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.math.BigDecimal; -/** - * @author wzy - * @date 2022-05-05 - **/ @Data @TableName("mall_member_withdraw") public class MallMemberWithdraw extends BaseEntity { + + private String withdrawNo; private Long memberId; private BigDecimal amount; /** - * 状态 1-提现中 2-提现成功 3-提现失败 + * 状态 1-成功 2-进行中 0-失败 */ private Integer status; @@ -27,5 +26,8 @@ private String name; - private String withdrawNo; + private String type; + + @TableField(exist = false) + private String account; } -- Gitblit v1.9.1