From 547431dc08dc83824dd8dfa73b1ada4ca770e81f Mon Sep 17 00:00:00 2001
From: weizong song <sdswz@qq.com>
Date: Wed, 14 Apr 2021 00:10:42 +0800
Subject: [PATCH] up

---
 app/Http/Controllers/Manager/OrdersController.php |  4 ++--
 app/Models/Orders.php                             | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Manager/OrdersController.php b/app/Http/Controllers/Manager/OrdersController.php
index 38e2703..825969c 100644
--- a/app/Http/Controllers/Manager/OrdersController.php
+++ b/app/Http/Controllers/Manager/OrdersController.php
@@ -550,7 +550,7 @@ class OrdersController extends CommonController
         DB::beginTransaction();
         try {
             $order = Orders::with(["customer", "patient", "product", "productItem", "productParamedicLevel"])->find($id);
-            if (request()->paramedic_id && $order->paramedic_id && (request()->paramedic_id != $order->paramedic_id)) {
+            if ($order->isOngoing() && $order->paramedic_id != request()->paramedic_id) {
                 return response()->json([
                     "errorcode" => "103",
                     "errormsg" => "修改订单不包含护工更改，更换护工请移步"
@@ -600,7 +600,7 @@ class OrdersController extends CommonController
             $order->update($update);
 
             //如果原本的护工id为空且新提交了护工id，视同为派单
-            if (!$order->paramedic_id && request()->paramedic_id) {
+            if ($order->isPending && request()->paramedic_id) {
                 $order->update([
                     "paramedic_id" => request()->paramedic_id,
                     "status" => Orders::STATUS_ONGOING
diff --git a/app/Models/Orders.php b/app/Models/Orders.php
index 2ca8336..b1a4f58 100755
--- a/app/Models/Orders.php
+++ b/app/Models/Orders.php
@@ -47,6 +47,16 @@ class Orders extends SoftDeletesModel
         }
     }
 
+    public function isPending()
+    {
+        return in_array($this->status, [self::STATUS_UNCONFIRMED, self::STATUS_UNASSIGNED]);
+    }
+
+    public function isOngoing()
+    {
+        return $this->status == self::STATUS_ONGOING;
+    }
+
     public function getStatusNameAttribute()
     {
         return $this->getStatusLabelAttribute();