From 456773f190143ab8fb5910d34ef85c242e950ea7 Mon Sep 17 00:00:00 2001 From: ctexthuang Date: Mon, 31 Mar 2025 16:28:39 +0800 Subject: [PATCH] fix : user site --- app/Service/Api/Coupon/CouponListService.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Service/Api/Coupon/CouponListService.php b/app/Service/Api/Coupon/CouponListService.php index d4c2887..ec13e67 100644 --- a/app/Service/Api/Coupon/CouponListService.php +++ b/app/Service/Api/Coupon/CouponListService.php @@ -44,18 +44,19 @@ class CouponListService extends BaseService $join->on('user_coupon.coupon_template_id', '=', 'coupon_template.id') ->where('user_coupon.user_id', '=', $this->userId) ->when($searchStatus, function ($query, $searchStatus) { - $query->where('user_coupon.status','=',$searchStatus); +// $query->where('user_coupon.status','=',$searchStatus); switch ($searchStatus) { case CouponCode::COUPON_STATUS_UNUSED: - $query->where('user_coupon.validity_end_time', '>=', date('Y-m-d H:i:s')); + $query->where('user_coupon.status','=',$searchStatus)->where('user_coupon.validity_end_time', '>=', date('Y-m-d H:i:s')); break; case CouponCode::COUPON_STATUS_EXPIRE: - $query->where('user_coupon.validity_end_time', '<', date('Y-m-d H:i:s')); + $query->where('user_coupon.status','=',$searchStatus)->where('user_coupon.validity_end_time', '<', date('Y-m-d H:i:s')); break; case CouponCode::COUPON_STATUS_CAN_USED: - $query->where('user_coupon.validity_start_time', '<=', date('Y-m-d H:i:s')); + $query->where('user_coupon.status','=',CouponCode::COUPON_STATUS_UNUSED)->where('user_coupon.validity_start_time', '<=', date('Y-m-d H:i:s')); break; case CouponCode::COUPON_STATUS_USED: + $query->where('user_coupon.status','=',$searchStatus); default: break; }