From 2347f66eaf2d2aac035c09b01e661e03f375970f Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Thu, 9 Nov 2023 14:47:23 +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=E4=B8=8D=E9=87=8D=E5=A4=8D=E5=8F=91=E6=94=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Consumer/UserCouponExpiredDelayDirectConsumer.php |  2 +-
 app/Services/CouponService.php                        | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php b/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php
index 83ba436..5301390 100644
--- a/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php
+++ b/app/Amqp/Consumer/UserCouponExpiredDelayDirectConsumer.php
@@ -40,7 +40,7 @@ class UserCouponExpiredDelayDirectConsumer extends ConsumerMessage
 
     public function consumeMessage($data, AMQPMessage $message): string
     {
-        Log::getInstance("queue-UserCouponExpired")->error("开始：" . json_encode($data, JSON_UNESCAPED_UNICODE));
+        Log::getInstance("queue-UserCouponExpired")->info("开始：" . json_encode($data, JSON_UNESCAPED_UNICODE));
 
         // 检测参数
         if (!isset($data['user_coupon_id'])){
diff --git a/app/Services/CouponService.php b/app/Services/CouponService.php
index d7d98e8..2269e1c 100644
--- a/app/Services/CouponService.php
+++ b/app/Services/CouponService.php
@@ -67,16 +67,13 @@ class CouponService extends BaseService
             return true;
         }
 
-        // 判断该优惠卷过期时间
-        if ($coupon['coupon_status'] != 1){
-            return true;
-        }
-
         // 判断该优惠卷过期时间
         if ($coupon['valid_type'] == 1){
             // 绝对时效
-            $date = date('Y-m-d H:i:s',time());
-            if ($coupon['valid_end_time'] < $date){
+            $valid_end_time = strtotime($coupon['valid_end_time']);
+
+            $date = time() + 60 * 5;
+            if ($valid_end_time < $date){
                 // 超出结束使用时间
                 return true;
             }