From dadacf7c1065876248bec86cf17c06ca4be1b97c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 30 七月 2019 14:55:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
index c1cbbf7..ac946ff 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
@@ -37,7 +37,7 @@
@Resource
private TLJBuyGoodsService tljBuyGoodsService;
-
+
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
@@ -99,9 +99,9 @@
}
/**
- * 姣忓ぉ鍑屾櫒杩�3鍒嗛挓楠岃瘉
+ * 姣忓ぉ鍑屾櫒5鐐硅繃10鍒嗛挓楠岃瘉
*/
- @Scheduled(cron = "0 3 0 * * ?")
+ @Scheduled(cron = "0 10 5 * * ? ")
public void updateBuyTLJGoods() {
if (!Constant.IS_TASK)
return;
@@ -112,25 +112,16 @@
for (int i = 0; i < list.size(); i++) {
if (count >= 10)
break;
- boolean success = tljBuyGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId());
+ boolean success = shareHotGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId(),
+ new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
+ TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT));
if (success) {
- count++;
+ count++;
}
}
}
- /**
- * 姣忓ぉ鏅氫笂11鐐�50娣诲姞娣樼ぜ閲�
- */
- @Scheduled(cron = "0 50 23 * * ? ")
- public void autoAddTLJBuyGoods() {
- if (!Constant.IS_TASK)
- return;
- String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
- List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1);
- Collections.shuffle(list);
- if (list.size() > 20)
- list = list.subList(0, 20);
+ private void addTLJBuyGoods(List<TaoBaoGoodsBrief> list, String day) {
for (TaoBaoGoodsBrief goods : list) {
// 鑾峰彇鍟嗗搧璇︽儏
try {
@@ -149,9 +140,39 @@
tljBuyGoodsService.addTLJBuyGoods(
new TLJBuyGoods(null, day, new Date(), goods, totalHongBaoCount, leftHongBaoCount),
TaoBaoConstant.ownBuyApp);
- }
+ }
}
}
}
+ /**
+ * 姣忓ぉ鏅氫笂11鐐�50娣诲姞娣樼ぜ閲�1涓晢鍝侊紝鐢ㄤ簬鍏煎Android鍓嶇娌℃湁鍟嗗搧涓嶆樉绀篵anner鐨勯棶棰�
+ */
+ @Scheduled(cron = "0 50 23 * * ? ")
+ public void autoAddTLJBuyGoods() {
+ if (!Constant.IS_TASK)
+ return;
+ String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+ List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1);
+ Collections.shuffle(list);
+ if (list.size() > 0)
+ list = list.subList(0, 1);
+ addTLJBuyGoods(list, day);
+ }
+
+ /**
+ * 姣忓ぉ鍑屾櫒5鐐硅繃1鍒嗗紑濮嬬埇鍙栧墿浣�9涓晢鍝�
+ */
+ @Scheduled(cron = "0 1 5 * * ? ")
+ public void autoAddTLJBuyGoods2() {
+ if (!Constant.IS_TASK)
+ return;
+ String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd");
+ List<TaoBaoGoodsBrief> list = tljBuyGoodsService.listPreGoods(1);
+ Collections.shuffle(list);
+ if (list.size() > 20)
+ list = list.subList(0, 20);
+ addTLJBuyGoods(list, day);
+ }
+
}
--
Gitblit v1.8.0