zhangwei #5

Merged
weiz merged 3 commits from zhangwei into master 2023-09-20 17:16:22 +08:00
3 changed files with 43 additions and 12 deletions
Showing only changes of commit 7914a757a6 - Show all commits

View File

@ -12,26 +12,57 @@ class UserLists extends BaseAdminDataLists implements ListsSearchInterface
public function setSearch(): array
{
return [
'=' => ['status'],
'%like%' => ['nick_name','phone'],
'=' => ['status','age','gender'],
'%like%' => ['nick_name','real_name','phone'],
];
}
// 获取用户列表
public function lists(): array
{
$field = "id,phone,avatar,nick_name,real_name,id_card,gender,age,total_balance,total_integral,status,create_time";
return User::field($field)->where($this->searchWhere)->where('status','<>',2)
$params = $this->params;
$field = "u.id,phone,avatar,nick_name,real_name,id_card,gender,age,total_balance,total_integral,CONCAT(province_name,city_name,area_name,street_name,village_name,brigade_name,address) as address,status,create_time";
return User::alias('u')->field($field)
->leftJoin('geo_province p','u.province = p.province_code')
->leftJoin('geo_city c','u.city = c.city_code')
->leftJoin('geo_area a','u.area = a.area_code')
->leftJoin('geo_street s','u.street = s.street_code')
->leftJoin('geo_village v','u.village = v.village_code')
->leftJoin('geo_brigade b','u.brigade = b.id')
->where('status','<>',2)
->where($this->searchWhere)
->where(function($query) use ($params){
if(isset($params['address'])){
$query->where('CONCAT(province_name,city_name,area_name,street_name,village_name,brigade_name,address) LIKE "%'.$params['address'].'%"');
}
})
->limit($this->limitOffset, $this->limitLength)
->order('id desc')->select()->each(function($item){
$item['status_text'] = $item->status_text;
->order('u.id desc')
->select()->each(function($item){
$item['gender_text'] = $item->gender_text;
$item['status_text'] = $item->status_text;
})->toArray();
}
// 获取数量
public function count(): int
{
return User::field('id')->where($this->searchWhere)->where('status','<>',2)->count();
$params = $this->params;
$field = "u.id,CONCAT(province_name,city_name,area_name,street_name,village_name,brigade_name,address) as address,status,create_time";
return User::alias('u')->field($field)
->leftJoin('geo_province p','u.province = p.province_code')
->leftJoin('geo_city c','u.city = c.city_code')
->leftJoin('geo_area a','u.area = a.area_code')
->leftJoin('geo_street s','u.street = s.street_code')
->leftJoin('geo_village v','u.village = v.village_code')
->leftJoin('geo_brigade b','u.brigade = b.id')
->where('status','<>',2)
->where($this->searchWhere)
->where(function($query) use ($params){
if(isset($params['address'])){
$query->where('CONCAT(province_name,city_name,area_name,street_name,village_name,brigade_name,address) LIKE "%'.$params['address'].'%"');
}
})
->count();
}
}

View File

@ -14,7 +14,7 @@
return [
'middleware' => [
app\api\http\middleware\InitMiddleware::class, // 初始化
// app\api\http\middleware\VerifySignMiddleware::class, // 签名验证
app\api\http\middleware\VerifySignMiddleware::class, // 签名验证
app\api\http\middleware\LoginMiddleware::class, // 登录验证
],
];

View File

@ -32,7 +32,7 @@ class IndexController extends BaseApiController
return $this->fail('短信场景错误');
}
//验证手机号
$user = User::field('user_phone')->where('user_phone',$params['phone'])->findOrEmpty();
$user = User::field('phone')->where('phone',$params['phone'])->findOrEmpty();
if($user->isEmpty()){
return $this->fail('手机号码错误');
}