소스 검색

fixed:技师端-出发 (兼容抢单和上门)

刘学玺 4 달 전
부모
커밋
8d1ff2e0c4
2개의 변경된 파일4개의 추가작업 그리고 5개의 파일을 삭제
  1. 0 1
      app/Services/Client/OrderService.php
  2. 4 4
      app/Services/Coach/OrderService.php

+ 0 - 1
app/Services/Client/OrderService.php

@@ -531,7 +531,6 @@ class OrderService
             try {
                 // 1. 验证用户和订单
                 $order = $this->validateOrderForFinish($userId, $orderId);
-                abort_if($order->state == OrderStatus::FINISHED->value, 400, '订单已完成');
 
                 // 2. 验证技师状态
                 $coach = $this->validateCoach($order->coach_id);

+ 4 - 4
app/Services/Coach/OrderService.php

@@ -604,7 +604,7 @@ class OrderService
                 abort_if($order->coach_id !== $user->coach->id, 403, '无权操作此订单');
 
                 // 检查订单状态是否为已分配技师
-                abort_if($order->status !== OrderStatus::ASSIGNED->value, 400, '订单状态不正确');
+                abort_if($order->state != OrderStatus::ASSIGNED->value && $order->state != OrderStatus::ACCEPTED->value, 400, '订单状态不正确');
 
                 // 更新订单状态为技师出发
                 $order->state = OrderStatus::DEPARTED->value;
@@ -614,8 +614,8 @@ class OrderService
                 OrderRecord::create([
                     'order_id' => $orderId,
                     'state' => OrderRecordStatus::DEPARTED->value,
-                    'operator_id' => $user->coach->id,
-                    'operator_type' => CoachUser::class,
+                    'object_id' => $user->coach->id,
+                    'object_type' => CoachUser::class,
                     'remark' => '技师已出发',
                 ]);
 
@@ -628,7 +628,7 @@ class OrderService
                     'message' => '操作成功',
                     'data' => [
                         'order_id' => $orderId,
-                        'status' => $order->status,
+                        'status' => $order->state,
                         'created_at' => $order->created_at,
                     ],
                 ];