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; }