From 80060571acf0c50e868bb0d7368d690d2f496745 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 02 Jun 2022 16:05:42 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 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 f10bd31..d543d9b 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallGoods.java
@@ -47,13 +47,65 @@
private Integer isHot;
- private BigDecimal staticMultiple;
+ /**
+ * 静态倍数
+ */
+ private BigDecimal staticMulti;
+ /**
+ * 静态占比
+ */
+ private BigDecimal staticProp;
+
+ /**
+ * 是否多规则 1-是 2-否
+ */
+ private Integer isSku;
+
+ /**
+ * 是否普通商品 1-普通商品 2-套餐
+ */
private Integer isNormal;
+
+ /**
+ * 库存
+ */
+ private Integer stock;
+
+ /**
+ * 销量
+ */
+ private Integer volume;
+
+ /**
+ * 成本价
+ */
+ private BigDecimal costPrice;
+
+ /**
+ * 商品类型 1-付费商品 2-积分商品
+ */
+ private Integer goodsType;
+
+ /**
+ * 积分
+ */
+ private BigDecimal score;
@TableField(exist = false)
private List<MallGoodsStyle> styles;
@TableField(exist = false)
+ private List<MallGoodsSku> skus;
+
+ @TableField(exist = false)
private List<String> images;
+
+ @TableField(exist = false)
+ private String orderNo;
+
+ private Integer hasCarriage;
+
+ private BigDecimal carriage;
+
}
--
Gitblit v1.9.1