|
@@ -2,13 +2,13 @@
|
|
|
|
|
|
namespace App\Services\Client\Traits;
|
|
|
|
|
|
+use Carbon\Carbon;
|
|
|
+use App\Models\Order;
|
|
|
+use App\Models\CoachUser;
|
|
|
use App\Enums\OrderStatus;
|
|
|
-use App\Enums\TechnicianAuthStatus;
|
|
|
-use App\Enums\TechnicianStatus;
|
|
|
use App\Models\CoachSchedule;
|
|
|
-use App\Models\CoachUser;
|
|
|
-use App\Models\Order;
|
|
|
-use Carbon\Carbon;
|
|
|
+use App\Enums\TechnicianStatus;
|
|
|
+use App\Enums\TechnicianAuthStatus;
|
|
|
|
|
|
/**
|
|
|
* 服务时间验证 Trait
|
|
@@ -57,8 +57,11 @@ trait ValidatesServiceTime
|
|
|
abort_if(! $coach, 400, '技师不存在或未激活');
|
|
|
|
|
|
// 验证技师认证状态
|
|
|
- abort_if(! $coach->info || $coach->info->state !== TechnicianAuthStatus::PASSED->value,
|
|
|
- 400, '技师未通过认证');
|
|
|
+ abort_if(
|
|
|
+ ! $coach->info || $coach->info->state !== TechnicianAuthStatus::PASSED->value,
|
|
|
+ 400,
|
|
|
+ '技师未通过认证'
|
|
|
+ );
|
|
|
|
|
|
// 验证服务时间基本参数
|
|
|
$this->validateBasicServiceTime($serviceTime);
|
|
@@ -129,7 +132,7 @@ trait ValidatesServiceTime
|
|
|
];
|
|
|
}
|
|
|
|
|
|
- $timeRanges = json_decode($schedule->time_ranges, true);
|
|
|
+ $timeRanges = is_string($schedule->time_ranges) ? json_decode($schedule->time_ranges, true) : $schedule->time_ranges;
|
|
|
|
|
|
return [
|
|
|
'work_days' => range(1, 7), // 默认每天都工作
|