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/OrderItemVo.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java b/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
index 0acf05d..d7a0c3d 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java
@@ -15,11 +15,20 @@
@ApiModel(value = "OrderListItemVo", description = "订单列表明细返回参数类")
public class OrderItemVo {
+ @ApiModelProperty(value = "id")
+ private Long id;
+
@ApiModelProperty(value = "skuId")
private Long skuId;
@ApiModelProperty(value = "商品名称")
private String goodsName;
+
+ @ApiModelProperty(value = "优惠卷ID")
+ private Long memberCouponId;
+
+ @ApiModelProperty(value = "推销员邀请码")
+ private String memberInviteId;
@ApiModelProperty(value = "样式名称")
private String styleName;
@@ -35,4 +44,16 @@
@ApiModelProperty(value = "单价")
private BigDecimal price;
+
+ @ApiModelProperty(value = "1-普通商品 2-套餐")
+ private Integer isNormal;
+
+ @ApiModelProperty(value = "商品ID")
+ private Long goodsId;
+
+ @ApiModelProperty(value = "1:正常 2：退款中3：已退")
+ private Integer state;
+
+ @ApiModelProperty(value = "支付金额")
+ private BigDecimal itemAmount;
}
--
Gitblit v1.9.1