fix : user site
This commit is contained in:
@@ -44,18 +44,19 @@ class CouponListService extends BaseService
|
|||||||
$join->on('user_coupon.coupon_template_id', '=', 'coupon_template.id')
|
$join->on('user_coupon.coupon_template_id', '=', 'coupon_template.id')
|
||||||
->where('user_coupon.user_id', '=', $this->userId)
|
->where('user_coupon.user_id', '=', $this->userId)
|
||||||
->when($searchStatus, function ($query, $searchStatus) {
|
->when($searchStatus, function ($query, $searchStatus) {
|
||||||
$query->where('user_coupon.status','=',$searchStatus);
|
// $query->where('user_coupon.status','=',$searchStatus);
|
||||||
switch ($searchStatus) {
|
switch ($searchStatus) {
|
||||||
case CouponCode::COUPON_STATUS_UNUSED:
|
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;
|
break;
|
||||||
case CouponCode::COUPON_STATUS_EXPIRE:
|
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;
|
break;
|
||||||
case CouponCode::COUPON_STATUS_CAN_USED:
|
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;
|
break;
|
||||||
case CouponCode::COUPON_STATUS_USED:
|
case CouponCode::COUPON_STATUS_USED:
|
||||||
|
$query->where('user_coupon.status','=',$searchStatus);
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user