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/dto/AddMallGoodsDto.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
index a8f3912..fdf6ed7 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AddMallGoodsDto.java
@@ -24,6 +24,8 @@
private String thumbs;
+ private String goodsParameter;
+
private String goodsDetails;
private Integer isSale;
@@ -71,4 +73,29 @@
* 是否普通商品 1-普通商品 2-套餐
*/
private Integer isNormal;
+
+ private BigDecimal score;
+
+ private Integer goodsType;
+
+ private Integer hasCarriage;
+
+ private BigDecimal carriage;
+ //运费方式 （1：固定运费 2：运费模板）
+ private Integer carriageType;
+ //运费金额
+ private BigDecimal carriageAmount;
+ //运费模板ID
+ private Long carriageRuleId;
+ //重量
+ private BigDecimal goodsWeight;
+ //序号
+ private Integer orderNumber;
+ private String levelOnePrice;
+ private String levelTwoPrice;
+ private String levelThreePrice;
+
+ //优惠卷IDs
+ private List<Long> couponIds;
+
}
--
Gitblit v1.9.1