|
@@ -598,10 +598,10 @@ class OrderService
|
|
|
abort_if($order->coach_id !== $user->coach->id, 403, '无权操作此订单');
|
|
|
|
|
|
// 检查订单状态是否为已分配技师
|
|
|
- abort_if($order->status !== OrderRecordStatus::ASSIGNED->value, 400, '订单状态不正确');
|
|
|
+ abort_if($order->status !== OrderStatus::ASSIGNED->value, 400, '订单状态不正确');
|
|
|
|
|
|
// 更新订单状态为技师出发
|
|
|
- $order->status = OrderStatus::DEPARTED->value;
|
|
|
+ $order->state = OrderStatus::DEPARTED->value;
|
|
|
$order->save();
|
|
|
|
|
|
// 记录订单状态变更日志
|
|
@@ -658,26 +658,24 @@ class OrderService
|
|
|
|
|
|
// 检查是否是该技师的订单
|
|
|
abort_if($order->coach_id !== $coach->id, 403, '无权操作此订单');
|
|
|
- dd(in_array($order->status, [
|
|
|
- OrderStatus::DEPARTED->value,
|
|
|
- ]));
|
|
|
+
|
|
|
// 检查订单状态
|
|
|
- abort_if(! in_array($order->status, [
|
|
|
+ abort_if(! in_array($order->state, [
|
|
|
OrderStatus::DEPARTED->value,
|
|
|
]), 400, '订单状态不正确');
|
|
|
|
|
|
$now = now();
|
|
|
|
|
|
// 更新订单状态为技师到达
|
|
|
- $order->status = OrderRecordStatus::ARRIVED->value;
|
|
|
+ $order->state = OrderStatus::ARRIVED->value;
|
|
|
$order->save();
|
|
|
|
|
|
// 记录订单状态变更日志
|
|
|
OrderRecord::create([
|
|
|
'order_id' => $orderId,
|
|
|
- 'status' => OrderRecordStatus::ARRIVED->value,
|
|
|
- 'operator_id' => $coach->id,
|
|
|
- 'operator_type' => CoachUser::class,
|
|
|
+ 'state' => OrderRecordStatus::ARRIVED->value,
|
|
|
+ 'object_id' => $coach->id,
|
|
|
+ 'object_type' => CoachUser::class,
|
|
|
'remark' => '技师已到达',
|
|
|
]);
|
|
|
|
|
@@ -711,7 +709,7 @@ class OrderService
|
|
|
'message' => '操作成功',
|
|
|
'data' => [
|
|
|
'order_id' => $orderId,
|
|
|
- 'status' => $order->status,
|
|
|
+ 'status' => $order->state,
|
|
|
'arrived_at' => $now,
|
|
|
],
|
|
|
];
|