|
@@ -272,10 +272,7 @@ class PushService
|
|
|
$url = getProp($pushTask, 'url');
|
|
|
|
|
|
// 更新开始状态
|
|
|
- QappPushTaskLogs::updateData(['id' => $subTaskId], [
|
|
|
- 'status' => PushConst::STATUS_DOING,
|
|
|
- 'updated_at' => date('Y-m-d H:i:s')
|
|
|
- ]);
|
|
|
+ QappPushTaskLogs::updateSubTaskStatus($subTaskId, PushConst::STATUS_DOING);
|
|
|
|
|
|
// 循环批量
|
|
|
$regIdArr = array_chunk($regIds, 1000);
|
|
@@ -317,23 +314,16 @@ class PushService
|
|
|
break;
|
|
|
}
|
|
|
} catch (Exception $e) {
|
|
|
+ // 最终结果
|
|
|
$pushResult = 0 && $pushResult;
|
|
|
|
|
|
// 更新子任务失败状态
|
|
|
- QappPushTaskLogs::updateData(['id' => $subTaskId], [
|
|
|
- 'status' => PushConst::STATUS_FAIL,
|
|
|
- 'push_result' => json_encode($result, JSON_UNESCAPED_UNICODE),
|
|
|
- 'updated_at' => date('Y-m-d H:i:s')
|
|
|
- ]);
|
|
|
+ QappPushTaskLogs::updateSubTaskStatus($subTaskId, PushConst::STATUS_FAIL, $result);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
// 更新成功状态
|
|
|
- QappPushTaskLogs::updateData(['id' => $subTaskId], [
|
|
|
- 'status' => PushConst::STATUS_SUCCESS,
|
|
|
- 'push_result' => json_encode($result, JSON_UNESCAPED_UNICODE),
|
|
|
- 'updated_at' => date('Y-m-d H:i:s')
|
|
|
- ]);
|
|
|
+ QappPushTaskLogs::updateSubTaskStatus($subTaskId, PushConst::STATUS_SUCCESS, $result);
|
|
|
}
|
|
|
|
|
|
return $pushResult;
|