update order consumer

2025-12-01 16:31:13 +08:00
parent 68494c99e5
commit 2c32a0c0af
4 changed files with 188 additions and 62 deletions
@@ -41,12 +41,6 @@ class OrderConsumer extends ConsumerMessage

    protected $entityType = 'order';

-    #[Inject]
-    protected EntityParseFactory $entityParseFactory;
-
-    #[Inject]
-    protected Producer $producer;
-
    /**
     * 重写队列构建器，设置队列参数
     * 必须与 RabbitMQ 中现有队列的参数完全一致，否则会报 PRECONDITION_FAILED 错误
@@ -81,7 +75,7 @@ class OrderConsumer extends ConsumerMessage
        // dump('---');

        dump('---message');
-        dump(json_decode($message->getBody(), true));
+        dump(json_decode($message->getBody(), true)['message_id']);
        dump('---');

        // 获取重试次数
@@ -91,7 +85,8 @@ class OrderConsumer extends ConsumerMessage
        dump("Retry count: {$retryCount}/{$maxRetries}");

        try {
-            $parse = $this->entityParseFactory->createFromMessage($message);
+            // EntityParseFactory 使用静态方法调用，无需依赖注入
+            $parse = EntityParseFactory::createFromMessage($message);

            // 提取 metadata
            $metadata = [
@@ -122,7 +117,12 @@ class OrderConsumer extends ConsumerMessage
            // 在数据库事务中尝试对  $entityMapResult 中的元素进行持久化，如果没有问题， 则返回 ACK，否则这是 NACK 且 回滚事务。
            return Result::ACK;
        } catch (Throwable $error) {
-            dump($error->getMessage());
+            dump("=== Error Caught ===");
+            dump("Error: " . $error->getMessage());
+            dump("Retry Count: {$retryCount}");
+            dump("Max Retries: {$maxRetries}");
+            dump("Check: {$retryCount} >= {$maxRetries} = " . ($retryCount >= $maxRetries ? 'TRUE' : 'FALSE'));
+
            Log::get()->error('Consumer processing failed', [
                'error' => $error->getMessage(),
                'retry_count' => $retryCount,
@@ -133,16 +133,24 @@ class OrderConsumer extends ConsumerMessage
            // 检查是否超过最大重试次数
            if ($retryCount >= $maxRetries) {
                // 超过重试次数，发送到错误队列
-                dump("Max retries exceeded ({$retryCount}/{$maxRetries}), sending to error queue...");
-                $this->sendToErrorQueue($message, $error);
+                dump(">>> MAX RETRIES EXCEEDED! Sending to error queue...");
+
+                try {
+                    $this->sendToErrorQueue($message, $error);
+                    dump(">>> Successfully sent to error queue!");
+                } catch (Throwable $e) {
+                    dump(">>> FAILED to send to error queue: " . $e->getMessage());
+                    dump(">>> Stack trace: " . $e->getTraceAsString());
+                }

                // 返回 ACK 避免消息再次重试
                // 因为消息已经被发送到错误队列，不应该继续在主队列中循环
+                dump(">>> Returning ACK to prevent further retries");
                return Result::ACK;
            }

            // 未超过重试次数，返回 NACK 让消息进入 DLX -> retry 队列
-            dump("Retry {$retryCount}/{$maxRetries}, sending to retry queue...");
+            dump(">>> Retry not exceeded, sending to DLX (NACK)");
            return Result::NACK;
        }
    }
@@ -161,21 +169,35 @@ class OrderConsumer extends ConsumerMessage
     */
    protected function getRetryCount(AMQPMessage $message): int
    {
+        // 检查是否存在 application_headers 属性
+        // 首次处理的消息不会有这个属性，必须先用 has() 检查
+        if (!$message->has('application_headers')) {
+            dump(">>> No application_headers, first time processing");
+            return 0;
+        }
+
        $headers = $message->get('application_headers');
        if (!$headers) {
+            dump(">>> application_headers exists but is empty");
            return 0;
        }

        $headerData = $headers->getNativeData();
        $xDeath = $headerData['x-death'] ?? [];

+        dump(">>> x-death header data:");
+        dump($xDeath);
+
        if (empty($xDeath)) {
+            dump(">>> x-death is empty");
            return 0; // 首次失败
        }

        // x-death 是一个数组，第一个元素包含 count 字段
        // count 表示消息从该队列死信的次数
-        return $xDeath[0]['count'] ?? 0;
+        $count = $xDeath[0]['count'] ?? 0;
+        dump(">>> Extracted count from x-death: {$count}");
+        return $count;
    }

    /**
@@ -189,53 +211,22 @@ class OrderConsumer extends ConsumerMessage
    protected function sendToErrorQueue(AMQPMessage $message, Throwable $error): void
    {
        try {
-            $originalData = json_decode($message->getBody(), true);
+            $retryCount = $this->getRetryCount($message);

-            // 构建错误消息
-            $errorMessage = [
-                'error_id' => uniqid('err_', true),
-                'original_message' => $originalData,
-                'error' => [
-                    'type' => get_class($error),
-                    'message' => $error->getMessage(),
-                    'trace' => $error->getTraceAsString(),
-                    'timestamp' => date('c'),
-                ],
-                'metadata' => [
-                    'platform' => $originalData['platform'] ?? 'unknown',
-                    'platform_id' => $originalData['meta']['platform_id'] ?? null,
-                    'company_id' => $originalData['meta']['company_id'] ?? null,
-                    'store_id' => $originalData['meta']['store_id'] ?? null,
-                    'data_type' => $originalData['data_type'] ?? 'unknown',
-                    'failed_at' => date('c'),
-                    'retry_count' => $this->getRetryCount($message),
-                ],
-            ];
-
-            // 直接发布到 errors.queue
-            // 注意：这里直接发送到队列，不经过 exchange
-            $this->producer->produce(
-                new class($errorMessage) extends \Hyperf\Amqp\Message\ProducerMessage {
-                    protected string $exchange = '';
-                    protected string|array $routingKey = 'errors.queue';
-                    protected array $properties = [
-                        'delivery_mode' => 2, // 持久化
-                    ];
-
-                    public function __construct(array $data)
-                    {
-                        $this->payload = $data;
-                    }
-                }
-            );
+            // 使用 ErrorProducer 发送到错误队列
+            $producer = ApplicationContext::getContainer()->get(Producer::class);
+            $errorProducer = new ErrorProducer($message, $error, $retryCount);
+            $producer->produce($errorProducer);

+            // 记录日志
            Log::get()->warning('Message sent to error queue after exceeding retry limit', [
-                'error_id' => $errorMessage['error_id'],
-                'retry_count' => $errorMessage['metadata']['retry_count'],
+                'error_id' => $errorProducer->payload['error_id'] ?? 'unknown',
+                'retry_count' => $retryCount,
                'error_message' => $error->getMessage(),
            ]);
        } catch (Throwable $e) {
            // 发送到错误队列失败，记录日志
+            dump($e->getMessage());
            Log::get()->error('Failed to send message to error queue', [
                'error' => $e->getMessage(),
                'original_error' => $error->getMessage(),