From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java |   66 ---------------------------------
 1 files changed, 0 insertions(+), 66 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
index 8266070..05bfa81 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateTaoBaoGoodsJob.java
@@ -8,14 +8,9 @@
 import org.springframework.stereotype.Component;
 
 import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.ActivityException;
-import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.activity.ActivityService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
-import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefRecordService;
 import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
 import com.yeshi.fanli.service.inter.lable.LabelService;
 import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
@@ -23,7 +18,6 @@
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.util.CMQManager;
 import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
 /**
  * 娣樺疂鍟嗗搧鏇寸粏
@@ -37,9 +31,6 @@
 
 	@Resource
 	private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
-
-	@Resource
-	private RecommendSectionGoodsService recommendSectionGoodsService;
 
 	@Resource
 	private ActivityService activityService;
@@ -56,39 +47,6 @@
 	@Resource
 	private QualityFlashSaleService qualityFlashSaleService;
 	
-	@Resource
-	private TaoBaoGoodsBriefRecordService taoBaoGoodsBriefRecordService;
-	
-	
-
-	@Scheduled(cron = "0 0 0 * * ?")
-	public void doJob() {
-		if (!Constant.IS_TASK)
-			return;
-		taoBaoGoodsBriefService.getUpdateTaoBao();
-	}
-
-	// 涓ゅ皬鏃舵墽琛屼竴娆� 瀵规帹鑽愬晢鍝佷俊鎭繘琛屾洿鏂�
-	@Scheduled(cron = "0 0 */2 * * ?")
-	public void doUpdateJob() {
-		if (!Constant.IS_TASK)
-			return;
-		List<RecommendSectionGoods> list = taoBaoGoodsBriefService.listRecommendSectionGoods();
-		for (RecommendSectionGoods recommendSectionGoods : list) {
-			try {
-				TaoBaoGoodsBrief goods = TaoKeApiUtil
-						.searchGoodsDetail(recommendSectionGoods.getTaoBaoGoodsBrief().getAuctionId());
-				taoBaoGoodsUpdateService.updateTaoBaoGoods(goods);
-			} catch (TaobaoGoodsDownException e1) {
-				taoBaoGoodsUpdateService.downTaoBaoGoods(recommendSectionGoods.getTaoBaoGoodsBrief().getAuctionId());
-			} catch (Exception e) {
-				try {
-					LogHelper.errorDetailInfo(e);
-				} catch (Exception e1) {
-				}
-			}
-		}
-	}
 
 	// 鍔ㄦ�佸晢鍝佹洿鏂� 锛�1涓皬鏃舵洿鏂�
 	@Scheduled(cron = "0 0 */1 * * ?")
@@ -195,30 +153,6 @@
 				
 				qualityFlashSaleService.deleteBatchByPrimaryKey(list);
 			}
-			
-		} catch (Exception e) {
-			try {
-				LogHelper.errorDetailInfo(e);
-			} catch (Exception e1) {
-				e1.printStackTrace();
-			}
-		}
-	}
-	
-	
-	/**
-	 * 娓呯悊娣樺疂鍟嗗搧缂撳瓨璁板綍琛�
-	 */
-	@Scheduled(cron = "0 0 0 * * ? ")
-	public void cleanTaoBaoGoodsBriefRecord() {
-		
-		if (!Constant.IS_TASK) {
-			return;
-		}
-		
-		try {
-			
-			taoBaoGoodsBriefRecordService.deleteAllData();
 			
 		} catch (Exception e) {
 			try {

--
Gitblit v1.8.0