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/MallMemberCoupon.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java index 17916ab..c922737 100644 --- a/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java +++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMemberCoupon.java @@ -13,10 +13,18 @@ private Long memberId; private Long couponId; + private Long goodsId; private String couponName; + private String couponUuid; private String inviteId; //1:待使用 2:已使用 3:已过期 private Integer state; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date expireTime; + + /** + * 来源类型 1-默认 2-积分权益 3-失活会员 + */ + private Integer fromType; + } -- Gitblit v1.9.1