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/MallGoods.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
index d543d9b..fe7f3be 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
@@ -26,6 +26,8 @@
private String thumb;
+ private String goodsParameter;
+
private String goodsDetails;
private Integer isSale;
@@ -45,6 +47,11 @@
private Long categoryId;
+ /**
+ * 是否热卖 1：是 2：否
+ */
+ public static final Integer ISHOT_STATE_YES = 1;
+ public static final Integer ISHOT_STATE_NO = 2;
private Integer isHot;
/**
@@ -104,8 +111,30 @@
@TableField(exist = false)
private String orderNo;
+ @TableField(exist = false)
+ private Integer hasCollect;
+
private Integer hasCarriage;
private BigDecimal carriage;
+ private String wxCodeImg;
+ //运费方式 （1：固定运费 2：运费模板）
+ private Integer carriageType;
+ //运费金额
+ private BigDecimal carriageAmount;
+ //运费模板ID
+ private Long carriageRuleId;
+ //重量
+ private BigDecimal goodsWeight;
+ //序号
+ private Integer orderNumber;
+ private BigDecimal levelOnePrice;
+ private BigDecimal levelTwoPrice;
+ private BigDecimal levelThreePrice;
+
+
+ @TableField(exist = false)
+ private List<Long> couponIds;
+
}
--
Gitblit v1.9.1