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();