From 9b4ac7970d5694fb39dfc616b623ee121d58ae27 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 15:39:47 +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 | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 00e2ebb..8bd02a6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
@@ -48,13 +48,12 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
-
+
@Resource
private UserTaoLiJinGiveRecordService userTaoLiJinGiveRecordService;
-
+
@Resource
private UserTaoLiJinOriginService userTaoLiJinOriginService;
-
/**
* 鏇存柊鎶ュ憡
@@ -130,7 +129,7 @@
for (int i = 0; i < list.size(); i++) {
if (count >= 10)
break;
- boolean success = shareHotGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId(),
+ boolean success = tljBuyGoodsService.verifyCanCreateTLJ(list.get(i).getGoods().getAuctionId(),
new TaoKeAppInfo(app.getAppKey(), app.getAppSecret(), app.getDefaultPid()));
if (success) {
count++;
@@ -179,22 +178,21 @@
addTLJBuyGoods(list, day);
}
-
/**
- * 姣�2涓皬鏃� 璧犻�侀��鍥炲凡杩囨湡娣樼ぜ閲�
+ * 姣�2涓皬鏃� 璧犻�侀��鍥炲凡杩囨湡娣樼ぜ閲�
*/
@Scheduled(cron = "0 0 0/2 * * ? ")
public void giveSendBack() {
if (!Constant.IS_TASK)
return;
-
+
for (int i = 0; i < 100; i++) {
List<UserTaoLiJinGiveRecord> overdueList = userTaoLiJinGiveRecordService.overdueList(500);
if (overdueList == null || overdueList.size() == 0) {
break;
}
-
- for (UserTaoLiJinGiveRecord record: overdueList) {
+
+ for (UserTaoLiJinGiveRecord record : overdueList) {
try {
userTaoLiJinOriginService.giveSendBack(record.getGiveUid(), record);
// 鏇存柊璁板綍
--
Gitblit v1.8.0