From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
index f7a55b2..eb3ce8b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java
@@ -1,7 +1,7 @@
package com.yeshi.fanli.util.factory;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.goods.CommonGoods;
public class CommonGoodsFactory {
@@ -24,6 +24,7 @@
cg.setGoodsId(goods.getAuctionId());
cg.setGoodsType(CommonGoods.GOODS_TYPE_TB);
cg.setPicture(goods.getPictUrl());
+ cg.setPictureWhite(goods.getPictUrlWhite());
cg.setPrice(goods.getZkPrice());
cg.setSales(goods.getBiz30day());
cg.setRate(goods.getTkRate());
@@ -38,6 +39,8 @@
// 淇濈暀瀛楁
cg.setVideoCover(null);
cg.setVideoUrl(null);
+ cg.setState(goods.getState());
+ cg.setMaterialLibType(goods.getMaterialLibType());
return cg;
}
--
Gitblit v1.8.0