|
|
|
@ -38,6 +38,7 @@ class CouponController extends BaseController |
|
|
|
|
|
|
|
$ids = array_merge($c_ids->toArray(), $cr_ids->toArray()); |
|
|
|
|
|
|
|
//领过券的ID
|
|
|
|
$ids = collect($ids)->unique(); |
|
|
|
|
|
|
|
$c = Db::table('ims_system_coupon_user as u') |
|
|
|
@ -52,7 +53,9 @@ class CouponController extends BaseController |
|
|
|
->whereIn('u.id',$ids) |
|
|
|
->select('u.*','type.one_receive_number') |
|
|
|
->orderBy('u.weigh','desc') |
|
|
|
->orderByRaw('FIELD(u.id, '.implode(", " , $ids).')') |
|
|
|
->limit(4) |
|
|
|
|
|
|
|
->get(); |
|
|
|
return $this->success(['not_reveive'=>$c]); |
|
|
|
} |
|
|
|
@ -154,6 +157,9 @@ class CouponController extends BaseController |
|
|
|
->orderBy('u.weigh','desc') |
|
|
|
->get(); |
|
|
|
|
|
|
|
$not_expired = []; |
|
|
|
$expired = []; |
|
|
|
|
|
|
|
foreach ($coupons as $key => $coupon) { |
|
|
|
if ($coupon->usable_end_time < $nowTime || $coupon->number_remain <= 0) { |
|
|
|
$expired[] = $coupon; |
|
|
|
|