From 9b51a95fa8bc9b3a86108c6900e17fc55f8db467 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 17:02:07 +0800
Subject: [PATCH] refactor(vip): 优化积分和返佣计算逻辑

---
 src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 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 369b65b..6cb4c4c 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
@@ -26,11 +26,6 @@
 
     private String thumb;
 
-    /**
-     * ALTER TABLE `mall_goods`
-     * DROP COLUMN `goods_parameter`,
-     * ADD COLUMN `goods_parameter`  text NULL COMMENT '商品参数' AFTER `thumb`;
-     */
     private String goodsParameter;
 
     private String goodsDetails;
@@ -52,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;
 
     /**
@@ -63,6 +63,9 @@
      * 静态占比
      */
     private BigDecimal staticProp;
+
+    @TableField(exist = false)
+    private BigDecimal staticPropPrice;
 
     /**
      * 是否多规则 1-是 2-否
@@ -111,8 +114,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