usercouoin
parent
70430c318a
commit
83ac611971
|
|
@ -30,12 +30,12 @@ class UserController extends AdminController
|
||||||
{
|
{
|
||||||
$query = User::query();
|
$query = User::query();
|
||||||
|
|
||||||
|
$filter = [];
|
||||||
if ($request->filled('q')) {
|
if ($request->filled('q')) {
|
||||||
$search = '%' . $request->input('q'). '%';
|
$filter['key'] = $request->input('q');
|
||||||
$query->where(fn($q) => $q->where('phone', 'like', $search)->orWhere('name', 'like', $search));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$query->select(['id', 'phone as text'])->sort();
|
$query->filter($filter)->select(['id', 'phone as text'])->sort();
|
||||||
|
|
||||||
if ($request->filled('_paginate')) {
|
if ($request->filled('_paginate')) {
|
||||||
$list = $query->paginate();
|
$list = $query->paginate();
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ use Peidikeji\User\Filters\UserFilter;
|
||||||
use Dcat\Admin\Traits\HasDateTimeFormatter;
|
use Dcat\Admin\Traits\HasDateTimeFormatter;
|
||||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
|
use Peidikeji\Coupon\Models\UserCoupon;
|
||||||
use Peidikeji\Order\Models\Order;
|
use Peidikeji\Order\Models\Order;
|
||||||
|
|
||||||
class User extends Authenticatable
|
class User extends Authenticatable
|
||||||
|
|
@ -69,6 +70,11 @@ class User extends Authenticatable
|
||||||
return $this->hasMany(UserAddress::class, 'user_id');
|
return $this->hasMany(UserAddress::class, 'user_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function coupons()
|
||||||
|
{
|
||||||
|
return $this->hasMany(UserCoupon::class, 'user_id');
|
||||||
|
}
|
||||||
|
|
||||||
public function scopeSort($q)
|
public function scopeSort($q)
|
||||||
{
|
{
|
||||||
return $q->latest('id');
|
return $q->latest('id');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue