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/MallGoodsDetailsVo.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
index 25eebaa..378526e 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallGoodsDetailsVo.java
@@ -18,6 +18,9 @@
@ApiModelProperty(value = "id")
private Long id;
+ @ApiModelProperty(value = "商品主图")
+ private String thumb;
+
@ApiModelProperty(value = "商品编号")
private String goodsNo;
@@ -71,4 +74,38 @@
@ApiModelProperty(value = "评论数量")
private Integer commentCount;
+ //运费方式 （1：固定运费 2：运费模板）
+
+ @ApiModelProperty(value = "运费方式 （1：固定运费 2：运费模板）")
+ private Integer carriageType;
+ //运费金额
+
+ @ApiModelProperty(value = "固定运费金额")
+ private BigDecimal carriageAmount;
+ //运费模板ID
+
+ @ApiModelProperty(value = "运费模板ID")
+ private Long carriageRuleId;
+ //重量
+
+ @ApiModelProperty(value = "重量")
+ private BigDecimal goodsWeight;
+
+ @ApiModelProperty(value = "单位")
+ private String unit;
+
+ @ApiModelProperty(value = "1级代理价格")
+ private BigDecimal levelOnePrice;
+
+ @ApiModelProperty(value = "2级代理价格")
+ private BigDecimal levelTwoPrice;
+
+ @ApiModelProperty(value = "3级代理价格")
+ private BigDecimal levelThreePrice;
+
+ @ApiModelProperty(value = "是否收藏")
+ private Integer hasCollect;
+
+ @ApiModelProperty(value = "商品主图")
+ private String mainImage;
}
--
Gitblit v1.9.1