From e9bcfdba00460e64307f422bd08303a07b90a288 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 28 May 2022 16:18:54 +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 | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 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..b4da1ea 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,61 @@
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;
+
}
--
Gitblit v1.9.1