|
|
@@ -805,10 +805,9 @@ class StaffSalary extends Api
|
|
|
$jobHandlerClassName = 'app\job\InsertDataJob';
|
|
|
$queueName = 'salary_calculation';
|
|
|
|
|
|
- // 方法1:直接使用队列push(推荐)
|
|
|
+
|
|
|
$jobId = Queue::push($jobHandlerClassName, $taskData, $queueName);
|
|
|
|
|
|
- Log::info('队列提交结果', ['job_id' => $jobId, 'queue_name' => $queueName]);
|
|
|
|
|
|
if ($jobId !== false) {
|
|
|
// 更新任务记录
|
|
|
@@ -848,32 +847,6 @@ class StaffSalary extends Api
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 同步执行工资计算(用于测试和调试)
|
|
|
- */
|
|
|
- public function calculateDirect()
|
|
|
- {
|
|
|
- if (Request::instance()->isPost() == false) {
|
|
|
- $this->error('非法请求');
|
|
|
- }
|
|
|
-
|
|
|
- $params = Request::instance()->param();
|
|
|
-
|
|
|
- try {
|
|
|
- $service = new \app\service\SalaryCalculationService();
|
|
|
- $result = $service->calculateSalary($params);
|
|
|
-
|
|
|
- if ($result['success']) {
|
|
|
- $this->success($result['message'], null, $result['data']);
|
|
|
- } else {
|
|
|
- $this->error($result['message']);
|
|
|
- }
|
|
|
-
|
|
|
- } catch (\Exception $e) {
|
|
|
- $this->error('工资计算失败: ' . $e->getMessage());
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 查询工资计算状态
|
|
|
*/
|