diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php index 0c124c2..6641db1 100644 --- a/app/Controller/CouponController.php +++ b/app/Controller/CouponController.php @@ -159,11 +159,10 @@ class CouponController extends BaseController $expired = []; $couponIds = $couponIds->toArray(); - $coupons = Coupon::orderByRaw('FIELD(id, ' . implode(", ", $couponIds) . ')')->get(); - - + $coupons = Coupon::whereIn('id',$couponIds)->get(); + foreach ($coupons as $key => $coupon) { - if ($coupon->usable_end_time < $nowTime) { + if ($coupon->usable_end_time < $nowTime || $coupon->status != 1) { $expired[] = $coupon; } else { $not_expired[] = $coupon;