From 07d0a24ad81abeb81fb81f2fab190fdca9770bed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 11:03:01 +0800
Subject: [PATCH] Merge branch 'master' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
index 71546a4..b20598f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
@@ -1,27 +1,15 @@
 package com.yeshi.fanli.job;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import javax.annotation.Resource;
 
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import com.yeshi.fanli.entity.bus.lable.BoutiqueAutoRule;
-import com.yeshi.fanli.entity.bus.lable.QualityFactory;
-import com.yeshi.fanli.entity.common.AdminUser;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
 import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
 import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.taobao.DaTaoKeUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoUtil;
 
 /**
  * 鏇存柊澶ф窐瀹㈡暟鎹�
@@ -39,54 +27,6 @@
 	@Resource
 	private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
 
-	/**
-	 * 闄愭椂绉掓潃 鏁版嵁鏇存柊
-	 */
-	@Scheduled(cron = "0 0 0/2 * * ?")
-	public void doUpdateJob() {
-
-		if (!Constant.IS_TASK)
-			return;
-
-		List<DaTaoKeDetail> listTaoKe = DaTaoKeUtil.getDingDongQiang();
-		if (listTaoKe == null || listTaoKe.size() == 0) {
-			return;
-		}
-
-		List<Long> listDaoKeId = new ArrayList<Long>();
-		for (DaTaoKeDetail daTaoKeDetail : listTaoKe) {
-			listDaoKeId.add(daTaoKeDetail.getId());
-		}
-
-		List<DaTaoKeDetail> listDetail = daTaoKeGoodsService.listByIds(listDaoKeId);
-		if (listDetail == null || listDetail.size() == 0) {
-			return;
-		}
-
-		List<TaoBaoGoodsBrief> listgoods = new ArrayList<TaoBaoGoodsBrief>();
-		for (DaTaoKeDetail daTaoKeDetail : listDetail) {
-			listgoods.add(TaoBaoUtil.convert(daTaoKeDetail));
-		}
-
-		String formatDate = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
-		try {
-			/* 鎿嶄綔浜猴細 寮�鍙戣处鍙� */
-			AdminUser admin = new AdminUser(2L);
-			BoutiqueAutoRule autoRule = new BoutiqueAutoRule();
-			autoRule.setAdminUser(admin);
-			autoRule.setCalss9k9(false);
-			autoRule.setFlashSale(true);
-			autoRule.setStartWeight(1);
-			autoRule.setEndWeight(3000);
-			autoRule.setGoodsSource(QualityFactory.SOURCE_TAOBAO_DATAOKE);
-			qualityFactoryService.autoInsertOrUpadateStorage(autoRule, listgoods, null);
-
-			// 鍒犻櫎涔嬪墠鐨�
-			qualityFactoryService.deleteNotUpdateGoods(null, formatDate, autoRule.getGoodsSource());
-		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
-		}
-	}
 
 	// 1涓皬鏃舵洿鏂颁竴娆�
 	@Scheduled(cron = "0 0 0/1 * * ? ")

--
Gitblit v1.8.0