From afe61a27c4f77db65df66b0ff5dc93cbd3e0014b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:49:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java | 42 ++++++++++++++++--------------------------
1 files changed, 16 insertions(+), 26 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 43f2f8e..28cd75a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java
@@ -16,7 +16,6 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
-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.TimeUtil;
@@ -34,35 +33,11 @@
private QualityFactoryService qualityFactoryService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsService;
-
- @Resource
private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource
private ShareHotGoodsService shareHotGoodsService;
- @Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
- // 1涓皬鏃舵洿鏂颁竴娆�
- @Scheduled(cron = "0 0 0/1 * * ? ")
- public void doSyncJob() {
- if (!Constant.IS_TASK)
- return;
- try {
- new Thread(new Runnable() {
-
- @Override
- public void run() {
- daTaoKeGoodsService.startSyncGoods();
- }
- }).start();
-
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
- }
// 姣忓ぉ鏃╂櫄鍚屾涓�娆�
@Scheduled(cron = "0 0 6,18 * * ? ")
@@ -151,6 +126,9 @@
// 鑷姩閫夊搧
@Scheduled(cron = "0 0 23 * * ? ")
public void setShareHotGoods() {
+ if (!Constant.IS_TASK)
+ return;
+
String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
List<TaoBaoGoodsBrief> goodsList = shareHotGoodsService.listPreGoods(1);
Collections.shuffle(goodsList);
@@ -167,11 +145,23 @@
&& goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {
if (TaoBaoUtil.canAddToTLJBuyGoods(goods)) {
count++;
- goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+ goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods).getGoods();
shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));
}
}
}
}
+ @Scheduled(cron = "0 30 7,11,18,23 * * ? ")
+ public void syncGoodsBeiYong() {
+ if (!Constant.IS_TASK)
+ return;
+
+ long latestUpdateCount = daTaoKeGoodsDetailV2Service
+ .countByMinUpdateTime(new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L));
+ if (latestUpdateCount < 50000L) {// 鑻ユ瘡澶╂病鏈夎秴杩�5w鏁版嵁鏇存柊灏遍渶瑕侀噸鏂版洿鏂版暟鎹�
+ daTaoKeGoodsDetailV2Service.startSyncGoods();
+ }
+ }
+
}
--
Gitblit v1.8.0