From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
index 035b056..3ba40eb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
@@ -13,15 +13,17 @@
 import com.google.gson.Gson;
 import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoGoodsBriefMapper;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.exception.goods.CommonGoodsException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
 import com.yeshi.fanli.service.inter.activity.ActivityService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
+import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
 import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
 import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.util.BeanUtil;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.factory.CommonGoodsFactory;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
 @Service
@@ -39,7 +41,7 @@
 	private TaoBaoGoodsBriefMapper taoBaoGoodsBriefMapper;
 
 	@Resource
-	private CollectionGoodsService collectionGoodsService;
+	private CommonGoodsService commonGoodsService;
 
 	@Override
 	public void startUpdate() {
@@ -103,7 +105,11 @@
 			throw new TaobaoGoodsUpdateException(2, "鍟嗗搧ID涓虹┖");
 
 		// 鏇存柊鏀惰棌淇℃伅
-		collectionGoodsService.updateCollectionGoods(goods);
+		try {
+			commonGoodsService.updateCommonGoods(CommonGoodsFactory.create(goods));
+		} catch (CommonGoodsException e) {
+			e.printStackTrace();
+		}
 
 		List<TaoBaoGoodsBrief> goodsList = taoBaoGoodsBriefMapper.queryByAuctionId(goods.getAuctionId());
 		if (goodsList != null)
@@ -182,14 +188,24 @@
 
 	@Override
 	public void updateTaoBaoGoods(List<TaoBaoGoodsBrief> goodsList) throws TaobaoGoodsUpdateException {
-		if (goodsList == null)
-			return;
+		if (goodsList == null || goodsList.size() == 0)
+			throw new TaobaoGoodsUpdateException(1, "鍟嗗搧鍒楄〃涓虹┖");
+
 		List<TaoBaoGoodsBrief> updateList = new ArrayList<>();
+		
 		for (TaoBaoGoodsBrief goods : goodsList) {
-			if (goods.getId() == null || goods.getId() == 0L)
+			
+			if (goods.getId() == null || goods.getId() == 0L) {
 				throw new TaobaoGoodsUpdateException(1, "鍟嗗搧涓婚敭ID涓虹┖");
-			updateList.add(goods);
+			}
+			
+			
+			TaoBaoGoodsBrief updateGoods = getUpdateTaoBaoGoodsBrief(goods);
+			updateGoods.setCreatetime(goods.getCreatetime());
+			
+			updateList.add(updateGoods);
 		}
+		
 		taoBaoGoodsBriefMapper.updateBatchSelective(updateList);
 	}
 

--
Gitblit v1.8.0