diff --git a/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php b/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php index f0a9341..a4c7efe 100644 --- a/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php +++ b/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php @@ -42,8 +42,6 @@ class UserCouponExpiredDelayDirectConsumer extends ConsumerMessage { Log::getInstance("queue-UserCouponExpired")->info("开始:" . json_encode($data, JSON_UNESCAPED_UNICODE)); - return Result::DROP; - // 检测参数 if (!isset($data['user_coupon_id'])){ Log::getInstance("queue-UserCouponExpired")->error("入参错误"); diff --git a/app/Services/CouponService.php b/app/Services/CouponService.php index cc31006..14cbb23 100644 --- a/app/Services/CouponService.php +++ b/app/Services/CouponService.php @@ -133,12 +133,15 @@ class CouponService extends BaseService } // 添加优惠卷过期队列 - $valid_end_time = strtotime($user_coupon['valid_start_time']); + $valid_end_time = strtotime($user_coupon['valid_end_time']); $data = array(); $data['user_coupon_id'] = $user_coupon['user_coupon_id']; $time = $valid_end_time - time(); + if ($time < 0){ + return false; + } $message = new UserCouponExpiredDelayDirectProducer($data); $message->setDelayMs(1000 * $time); $producer = $this->container->get(Producer::class);