|
|
@@ -67,8 +67,7 @@ export class TaskService implements OnModuleInit {
|
|
|
private readonly userService: UsersService,
|
|
|
private readonly operatorConfigService: OperatorConfigService,
|
|
|
private readonly countryConfigService: CountryConfigService
|
|
|
- ) {
|
|
|
- }
|
|
|
+ ) {}
|
|
|
|
|
|
onModuleInit() {
|
|
|
this.lock.acquire('dispatchTask', async () => {
|
|
|
@@ -700,8 +699,7 @@ export class TaskService implements OnModuleInit {
|
|
|
if (durianRes.data.code === 200) {
|
|
|
res.durian = durianRes.data.data.score
|
|
|
}
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
+ } catch (e) {}
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -722,8 +720,7 @@ export class TaskService implements OnModuleInit {
|
|
|
if (cowboyRes.data.code === 200) {
|
|
|
res.cowboy = cowboyRes.data.data.score
|
|
|
}
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
+ } catch (e) {}
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -737,8 +734,7 @@ export class TaskService implements OnModuleInit {
|
|
|
if (parts[0] === '0') {
|
|
|
res.xyz = parts[1] < 0 ? 0 : parts[1]
|
|
|
}
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
+ } catch (e) {}
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -751,8 +747,7 @@ export class TaskService implements OnModuleInit {
|
|
|
if (cloud033Res.data.code === '1001') {
|
|
|
res.cloud033 = cloud033Res.data.data.integral
|
|
|
}
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
+ } catch (e) {}
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -765,8 +760,7 @@ export class TaskService implements OnModuleInit {
|
|
|
if (cloud034Res.data.code === '1001') {
|
|
|
res.cloud034 = cloud034Res.data.data.integral
|
|
|
}
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
+ } catch (e) {}
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -779,8 +773,7 @@ export class TaskService implements OnModuleInit {
|
|
|
if (cloud037Res.data.code === '1001') {
|
|
|
res.cloud037 = cloud037Res.data.data.integral
|
|
|
}
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
+ } catch (e) {}
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -793,8 +786,7 @@ export class TaskService implements OnModuleInit {
|
|
|
if (cloud041Res.data.code === '1001') {
|
|
|
res.cloud041 = cloud041Res.data.data.integral
|
|
|
}
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
+ } catch (e) {}
|
|
|
})()
|
|
|
])
|
|
|
return res
|
|
|
@@ -806,7 +798,7 @@ export class TaskService implements OnModuleInit {
|
|
|
|
|
|
return await this.taskItemRepository
|
|
|
.createQueryBuilder()
|
|
|
- .select(['COUNT(*) AS sent', 'DATE_FORMAT(sendAt, \'%Y-%m-%d %H:00:00\') AS hour'])
|
|
|
+ .select(['COUNT(*) AS sent', "DATE_FORMAT(sendAt, '%Y-%m-%d %H:00:00') AS hour"])
|
|
|
.where('sendAt BETWEEN :start AND :end', { start: twelveHoursAgo, end: new Date() })
|
|
|
.groupBy('hour')
|
|
|
.orderBy('hour', 'DESC')
|
|
|
@@ -831,8 +823,7 @@ export class TaskService implements OnModuleInit {
|
|
|
.andWhere('task.startedAt < CURDATE()')
|
|
|
.getRawOne()
|
|
|
res.orderCountYesterday = yesterdayOrderCount.sum
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
+ } catch (e) {}
|
|
|
})(),
|
|
|
(async () => {
|
|
|
try {
|
|
|
@@ -844,8 +835,7 @@ export class TaskService implements OnModuleInit {
|
|
|
.andWhere('task.startedAt < CURDATE() + INTERVAL 1 DAY')
|
|
|
.getRawOne()
|
|
|
res.orderCountToday = todayOrderCount.sum
|
|
|
- } catch (e) {
|
|
|
- }
|
|
|
+ } catch (e) {}
|
|
|
})()
|
|
|
])
|
|
|
|
|
|
@@ -1279,7 +1269,7 @@ export class TaskService implements OnModuleInit {
|
|
|
@Interval(10000)
|
|
|
async fixDeadTask() {
|
|
|
const tasks = await this.taskRepository.findBy({
|
|
|
- status: TaskStatus.PENDING
|
|
|
+ status: In([TaskStatus.PENDING, TaskStatus.CUTTING, TaskStatus.VIP])
|
|
|
})
|
|
|
for (let task of tasks) {
|
|
|
const items = await this.taskItemRepository.findBy({
|