|
@@ -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,
|
|
|
],
|
|
|
];
|