From fd555d167ff6b2a36f8f78671020243ac5e021d9 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Fri, 19 Jan 2024 09:12:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E6=83=A0=E5=8D=B7?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E9=98=9F=E5=88=97=EF=BC=8C=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BA=8B=E7=89=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php b/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php
index 5301390..5c137af 100644
--- a/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php
@@ -72,7 +72,6 @@ class UserCouponExpiredDelayDirectConsumer extends ConsumerMessage
         // 检测优惠卷过期时间
         $valid_end_time = strtotime($user_coupon['valid_end_time']);
 
-        Db::beginTransaction();
         try {
             // 处理未过期事件
             // 先删除-重新添加队列
@@ -80,14 +79,13 @@ class UserCouponExpiredDelayDirectConsumer extends ConsumerMessage
                 $time = $valid_end_time - time();
 
                 $queue_data = array();
-                $queue_data['order_inquiry_id'] = $data['order_inquiry_id'];
+                $queue_data['user_coupon_id'] = $user_coupon['user_coupon_id'];
 
                 $message = new UserCouponExpiredDelayDirectProducer($queue_data);
                 $message->setDelayMs(1000 * $time);
                 $producer = $this->container->get(Producer::class);
                 $res = $producer->produce($message);
                 if (!$res) {
-                    Db::rollBack();
                     Log::getInstance("queue-UserCouponExpired")->error("未到过期时间，重新添加队列失败");
                     return Result::REQUEUE;
                 }
@@ -103,12 +101,10 @@ class UserCouponExpiredDelayDirectConsumer extends ConsumerMessage
             $data['user_coupon_status'] = 3;
             UserCoupon::edit($params, $data);
         } catch (\Throwable $e) {
-            Db::rollBack();
             Log::getInstance("queue-UserCouponExpired")->error($e->getMessage());
             return Result::REQUEUE; // 重回队列
         }
 
-        Db::commit();
         Log::getInstance("queue-UserCouponExpired")->info("成功");
 
         Db::beginTransaction();