Wesmiler

app/Services/Common/MemberService.php

@@ -105,7 +105,8 @@ class MemberService extends BaseService
             });
         }
 
-        $total = $query->count('a.id');
+        $model = clone $query;
+        $total = $model->count('a.id');
         $list = $query->withCount(['invites'])
             ->orderBy('a.create_time', 'desc')
             ->orderBy('a.id', 'desc')
@@ -148,11 +149,6 @@ class MemberService extends BaseService
             $where['a.status'] = $status;
         }
 
-        $pickerStatus = isset($params['picker_status']) ? $params['picker_status'] : 0;
-        if ($pickerStatus > 0) {
-            $where['a.picker_status'] = $pickerStatus;
-        }
-
         $query = $this->model->from('member as a')
             ->where($where)
             ->where(function ($query) use ($params) {
@@ -167,22 +163,9 @@ class MemberService extends BaseService
                     $query->where('a.mobile', 'like', "%{$mobile}%");
                 }
             })
-            ->where(function ($query) use ($params) {
-                $confirmStatus = isset($params['confirm_status']) ? $params['confirm_status'] : -1;
-                if ($confirmStatus == 0) {
-                    $query->whereIn('a.confirm_status', [2, 3]);
-                } else if ($confirmStatus > 0) {
-                    $query->where('a.confirm_status', $confirmStatus);
-                }
-            })
             ->select(['a.*']);
-        $confirmStatus = isset($params['confirm_status']) ? $params['confirm_status'] : -1;
-        if ($confirmStatus == 0) {
-            $query->orderBy('a.confirm_status', 'asc')->orderBy('a.create_time', 'desc');
-        } else {
-            $query->orderBy('a.create_time', 'desc')->orderBy('a.id', 'desc');
-        }
 
+        $query->orderBy('a.create_time', 'desc')->orderBy('a.id', 'desc');
         $list = $query->paginate($pageSize > 0 ? $pageSize : 9999999);
         $list = $list ? $list->toArray() : [];
         if ($list) {
@@ -191,8 +174,6 @@ class MemberService extends BaseService
                 $item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H.i.s') : '';
                 $item['login_time'] = $item['login_time'] ? datetime($item['login_time'], 'Y-m-d H.i.s') : '';
                 $item['avatar'] = isset($item['avatar']) && $item['avatar'] ? get_image_url($item['avatar']) : '';
-                $item['driving_license'] = isset($item['driving_license']) && $item['driving_license'] ? get_image_url($item['driving_license']) : '';
-                $item['drivers_license'] = isset($item['drivers_license']) && $item['drivers_license'] ? get_image_url($item['drivers_license']) : '';
             }
         }