Ver Fonte

fixed:用户端-确认技师撤离

刘学玺 há 4 meses atrás
pai
commit
3288fbb137
2 ficheiros alterados com 11 adições e 3 exclusões
  1. 8 0
      app/Enums/OrderRecordStatus.php
  2. 3 3
      app/Services/Client/OrderService.php

+ 8 - 0
app/Enums/OrderRecordStatus.php

@@ -57,6 +57,11 @@ enum OrderRecordStatus: int
      */
     case DEPARTED = 10;
 
+    /**
+     * 记录状态:技师撤离
+     */
+    case LEFT = 11;
+
     /**
      * 获取状态的显示文本
      *
@@ -75,6 +80,7 @@ enum OrderRecordStatus: int
             self::CANCELLED => '已取消',
             self::REJECTED => '已拒单',
             self::DEPARTED => '技师出发',
+            self::LEFT => '技师撤离',
         };
     }
 
@@ -118,6 +124,7 @@ enum OrderRecordStatus: int
             self::CANCELLED->value => self::CANCELLED,
             self::REJECTED->value => self::REJECTED,
             self::DEPARTED->value => self::DEPARTED,
+            self::LEFT->value => self::LEFT,
             default => null
         };
     }
@@ -150,6 +157,7 @@ enum OrderRecordStatus: int
             self::CANCELLED->value => self::CANCELLED->label(),
             self::REJECTED->value => self::REJECTED->label(),
             self::DEPARTED->value => self::DEPARTED->label(),
+            self::LEFT->value => self::LEFT->label(),
         ];
     }
 }

+ 3 - 3
app/Services/Client/OrderService.php

@@ -589,7 +589,7 @@ class OrderService
                 // 1. 参数校验
                 $order = Order::where('user_id', $userId)
                     ->where('id', $orderId)
-                    ->where('state', 'service_end') // 订单状态必须是服务结束
+                    ->where('state', OrderStatus::FINISHED->value) // 订单状态必须是服务结束
                     ->firstOrFail();
 
                 if (! $order) {
@@ -601,12 +601,12 @@ class OrderService
                     'order_id' => $orderId,
                     'object_id' => $userId,
                     'object_type' => MemberUser::class,
-                    'state' => 'leave',
+                    'state' => OrderRecordStatus::LEFT->value,
                     'remark' => '技师已离开',
                 ]);
 
                 // 3. 修改订单状态为撤离
-                $order->state = 'leave';
+                $order->state = OrderStatus::LEFT->value;
                 $order->save();
 
                 return ['message' => '已确技师离开'];