loustwo 4 лет назад
Родитель
Сommit
9fcd3c98bf

+ 4 - 3
app/Http/Controllers/ReceivingTaskController.php

@@ -63,10 +63,11 @@ class ReceivingTaskController extends Controller
             return ['success' => false,'errors' =>['appointment_number' => ['对应预约号未找到']]];
         }
         if (!$delivery_appointment_car->deliveryAppointment){
-            return [['success' => false,'errors' =>['appointment_number' => ['对应预约号未找到']]]];
+            return ['success' => false,'errors' =>['appointment_number' => ['对应预约号未找到']]];
         }
-        if (!$delivery_appointment_car->deliveryAppointment->owner_id != $request->input('owner_id')){
-            return [['success' => false,'errors' =>['appointment_number' => ['预约号与货主未对应']]]];
+
+        if ($delivery_appointment_car->deliveryAppointment->owner_id != $request->input('owner_id')){
+            return ['success' => false,'errors' =>['appointment_number' => ['预约号与货主未对应']]];
         }
         if (ReceivingTask::query()->where('delivery_appointment_car_id',$delivery_appointment_car->id)->exists()){
             return ['success' => false, 'errors' =>['appointment_number' => ['预约号已有对应的任务']]];

+ 2 - 1
app/Services/ReceivingTaskService.php

@@ -2,12 +2,12 @@
 
 namespace App\Services;
 
-use App\DeliveryAppointment;
 use App\DeliveryAppointmentCar;
 use App\Traits\ServiceAppAop;
 use App\ReceivingTask;
 use App\Utils\IdCreate;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Ramsey\Uuid\Uuid;
 
@@ -54,6 +54,7 @@ class ReceivingTaskService
         $task_number = $this->buildTaskNumber();
         $params['number'] = $task_number;
         $params['delivery_appointment_car_id'] = $deliveryAppointmentCar->id;         // 预约号
+        $params['user_id'] = Auth::user()->id;
         $receivingTask = new ReceivingTask($params);
         DB::transaction(function () use ($deliveryAppointmentCar, $params, &$receivingTask) {
             $receivingTask->save();