From 5d4fa8a8746facadc73205e1b8abb68a40146be2 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Thu, 9 Nov 2023 13:08:12 +0800
Subject: [PATCH] 2

---
 .../GrantUserCouponDelayDirectConsumer.php    | 20 ++++++++++++++-----
 .../GrantUserCouponDelayDirectProducer.php    |  3 ---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/Amqp/Consumer/GrantUserCouponDelayDirectConsumer.php b/app/Amqp/Consumer/GrantUserCouponDelayDirectConsumer.php
index e4acdd3..a35031c 100644
--- a/app/Amqp/Consumer/GrantUserCouponDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/GrantUserCouponDelayDirectConsumer.php
@@ -5,21 +5,31 @@ declare(strict_types=1);
 namespace App\Amqp\Consumer;
 
 use App\Model\Coupon;
-use App\Model\OrderInquiry;
 use App\Services\CouponService;
 use App\Utils\Log;
+use Hyperf\Amqp\Message\ConsumerDelayedMessageTrait;
+use Hyperf\Amqp\Message\ProducerDelayedMessageTrait;
+use Hyperf\Amqp\Message\Type;
 use Hyperf\Amqp\Result;
 use Hyperf\Amqp\Annotation\Consumer;
 use Hyperf\Amqp\Message\ConsumerMessage;
 use Hyperf\DbConnection\Db;
 use PhpAmqpLib\Message\AMQPMessage;
 
-/**
- * 延迟发放用户优惠卷
- */
-#[Consumer(exchange: 'amqp.direct', routingKey: 'GrantUserCoupon', queue: 'grant.user.coupon.queue', nums: 1)]
+#[Consumer(nums: 1)]
 class GrantUserCouponDelayDirectConsumer extends ConsumerMessage
 {
+    use ProducerDelayedMessageTrait;
+    use ConsumerDelayedMessageTrait;
+
+    protected string $exchange = 'amqp.delay.direct';
+
+    protected ?string $queue = 'grant.user.coupon.delay.queue';
+
+    protected string $type = Type::DIRECT; //Type::FANOUT;
+
+    protected string|array $routingKey = 'GrantUserCoupon';
+
     public function consumeMessage($data, AMQPMessage $message): string
     {
         Log::getInstance("queue-GrantUserCoupon")->info("开始执行 延迟发放用户优惠卷 队列：" . json_encode($data, JSON_UNESCAPED_UNICODE));
diff --git a/app/Amqp/Producer/GrantUserCouponDelayDirectProducer.php b/app/Amqp/Producer/GrantUserCouponDelayDirectProducer.php
index 57273dc..909738d 100644
--- a/app/Amqp/Producer/GrantUserCouponDelayDirectProducer.php
+++ b/app/Amqp/Producer/GrantUserCouponDelayDirectProducer.php
@@ -9,9 +9,6 @@ use Hyperf\Amqp\Message\ProducerDelayedMessageTrait;
 use Hyperf\Amqp\Message\ProducerMessage;
 use Hyperf\Amqp\Message\Type;
 
-/**
- * 延迟发放用户优惠卷
- */
 #[Producer]
 class GrantUserCouponDelayDirectProducer extends ProducerMessage
 {