From ebce479a2d0634c90e5f80045e204248336b410d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 30 五月 2019 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 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 599c960..7fcd8d0 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
@@ -19,7 +19,6 @@
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
 import com.yeshi.fanli.service.inter.activity.ActivityService;
 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;
@@ -29,8 +28,6 @@
 
 @Service
 public class TaoBaoGoodsUpdateServiceImpl implements TaoBaoGoodsUpdateService {
-	@Resource
-	private RecommendSectionGoodsService recommendSectionGoodsService;
 
 	@Resource
 	private ActivityService activityService;
@@ -71,11 +68,8 @@
 	@Transactional
 	@Override
 	public void deleteTaoBaoGoods(Long auctionId) {
-		// 鍒犻櫎棣栭〉鎺ㄨ崘鏁版嵁
-		recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(auctionId);
-
 		// 鍒犻櫎绮鹃�夊簱鐩稿叧鐨勬暟鎹�
-		qualityFactoryService.deleteByTbAuctionId(auctionId);
+		qualityFactoryService.deleteByTaoBaoGoodsId(auctionId);
 
 		// 鍒犻櫎鍟嗗搧鏈韩鏁版嵁
 		taoBaoGoodsBriefMapper.deleteByAuctionId(auctionId);
@@ -84,13 +78,11 @@
 	@Transactional
 	@Override
 	public void offlineTaoBaoGoods(Long auctionId) {
-		// 鍒犻櫎棣栭〉鎺ㄨ崘鏁版嵁
-		recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(auctionId);
 		// 鏇存柊鍔ㄦ�佹暟鎹�
 		activityService.downTaoBaoGoods(auctionId);
 
 		// 鍒犻櫎绮鹃�夊簱鐩稿叧鐨勬暟鎹�
-		qualityFactoryService.deleteByTbAuctionId(auctionId);
+		qualityFactoryService.deleteByTaoBaoGoodsId(auctionId);
 
 		// 鍒犻櫎鍟嗗搧鏈韩鏁版嵁
 		taoBaoGoodsBriefMapper.deleteByAuctionId(auctionId);
@@ -190,6 +182,7 @@
 		updateGoods.setRootCategoryName(goods.getRootCategoryName());
 		updateGoods.setLeafCatId(goods.getLeafCatId());
 		updateGoods.setLeafName(goods.getLeafName());
+		updateGoods.setMaterialLibType(goods.getMaterialLibType());
 
 		return updateGoods;
 	}
@@ -202,14 +195,13 @@
 		List<TaoBaoGoodsBrief> updateList = new ArrayList<>();
 
 		for (TaoBaoGoodsBrief goods : goodsList) {
-
 			if (goods.getId() == null || goods.getId() == 0L) {
 				throw new TaobaoGoodsUpdateException(1, "鍟嗗搧涓婚敭ID涓虹┖");
 			}
-
+			
+			// 闇�瑕佹洿鏂扮殑淇℃伅
 			TaoBaoGoodsBrief updateGoods = getUpdateTaoBaoGoodsBrief(goods);
 			updateGoods.setCreatetime(goods.getCreatetime());
-
 			updateList.add(updateGoods);
 		}
 

--
Gitblit v1.8.0