|
@@ -9,6 +9,7 @@ use App\Enums\TechnicianStatus;
|
|
|
use App\Enums\UserStatus;
|
|
|
use App\Models\CoachSchedule;
|
|
|
use App\Models\CoachUser;
|
|
|
+use App\Models\MemberUser;
|
|
|
use App\Models\Order;
|
|
|
use Illuminate\Support\Carbon;
|
|
|
use Illuminate\Support\Facades\Auth;
|
|
@@ -21,12 +22,12 @@ class CoachService
|
|
|
/**
|
|
|
* 获取技师列表
|
|
|
*/
|
|
|
- public function getNearCoachList($latitude, $longitude)
|
|
|
+ public function getNearCoachList(int $userId, float $latitude, float $longitude)
|
|
|
{
|
|
|
$page = request()->get('page', 1);
|
|
|
$perPage = request()->get('per_page', 15);
|
|
|
// 获取当前用户
|
|
|
- $user = Auth::user();
|
|
|
+ $user = MemberUser::find($userId);
|
|
|
|
|
|
Log::info('Current user and coordinates:', [
|
|
|
'user' => $user ? $user->id : null,
|
|
@@ -39,7 +40,7 @@ class CoachService
|
|
|
throw new \Exception('用户未登录');
|
|
|
}
|
|
|
|
|
|
- if ($user->state !== 'enable') {
|
|
|
+ if ($user->state !== UserStatus::OPEN->value) {
|
|
|
throw new \Exception('用户状态异常');
|
|
|
}
|
|
|
|
|
@@ -62,13 +63,13 @@ class CoachService
|
|
|
$coaches = CoachUser::query()
|
|
|
->whereIn('id', $paginatedCoachIds)
|
|
|
->whereHas('info', function ($query) {
|
|
|
- $query->where('state', 'approved');
|
|
|
+ $query->where('state', TechnicianAuthStatus::PASSED->value);
|
|
|
})
|
|
|
->whereHas('real', function ($query) {
|
|
|
- $query->where('state', 'approved');
|
|
|
+ $query->where('state', TechnicianAuthStatus::PASSED->value);
|
|
|
})
|
|
|
->whereHas('qual', function ($query) {
|
|
|
- $query->where('state', 'approved');
|
|
|
+ $query->where('state', TechnicianAuthStatus::PASSED->value);
|
|
|
})
|
|
|
->with(['info:id,nickname,avatar,gender'])
|
|
|
->paginate($perPage);
|