From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandGoodsCahe.java | 59 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandGoodsCahe.java b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandGoodsCahe.java
index 46135da..92f6c65 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandGoodsCahe.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/brand/BrandGoodsCahe.java
@@ -6,7 +6,9 @@
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.mongodb.core.mapping.Field;
-import com.yeshi.fanli.vo.goods.GoodsDetailVO;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@Document(collection = "brand_goods_cahe")
public class BrandGoodsCahe implements Serializable{
@@ -19,8 +21,17 @@
@Field("brandId")
private Long brandId;
- @Field("goods")
- private GoodsDetailVO goods;
+ @Field("goodsType")
+ private Integer goodsType;
+
+ @Field("goodsTB")
+ private TaoBaoGoodsBrief goodsTB;
+
+ @Field("goodsJD")
+ private JDGoods goodsJD;
+
+ @Field("goodsPDD")
+ private PDDGoodsDetail goodsPDD;
@Field("weight")
private Integer weight;
@@ -28,8 +39,6 @@
@Field("createTime")
private Date createTime;
- @Field("updateTime")
- private Date updateTime;
public String getId() {
return id;
@@ -47,12 +56,36 @@
this.brandId = brandId;
}
- public GoodsDetailVO getGoods() {
- return goods;
+ public Integer getGoodsType() {
+ return goodsType;
}
- public void setGoods(GoodsDetailVO goods) {
- this.goods = goods;
+ public void setGoodsType(Integer goodsType) {
+ this.goodsType = goodsType;
+ }
+
+ public TaoBaoGoodsBrief getGoodsTB() {
+ return goodsTB;
+ }
+
+ public void setGoodsTB(TaoBaoGoodsBrief goodsTB) {
+ this.goodsTB = goodsTB;
+ }
+
+ public JDGoods getGoodsJD() {
+ return goodsJD;
+ }
+
+ public void setGoodsJD(JDGoods goodsJD) {
+ this.goodsJD = goodsJD;
+ }
+
+ public PDDGoodsDetail getGoodsPDD() {
+ return goodsPDD;
+ }
+
+ public void setGoodsPDD(PDDGoodsDetail goodsPDD) {
+ this.goodsPDD = goodsPDD;
}
public Integer getWeight() {
@@ -69,13 +102,5 @@
public void setCreateTime(Date createTime) {
this.createTime = createTime;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
}
}
--
Gitblit v1.8.0