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/vo/ApiOrderProfitVo.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java
index 53d0928..b069962 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiOrderProfitVo.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,10 +28,14 @@
@ApiModelProperty(value = "1：未提成 2：已提成")
private Integer state;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "创建时间")
private Date createdTime;
@ApiModelProperty(value = "产品名称")
- private String goodsName;;
+ private String goodsName;
+
+ @ApiModelProperty(value = "下单人昵称")
+ private String nickname;
}
--
Gitblit v1.9.1