订单

application/api/controller/AdminOrder.php

@@ -356,10 +356,10 @@ class AdminOrder extends SenderApi
             $this->error('送用户不存在');
         }
         Db::startTrans();
-        $order=UserOrder::where('way','manual')->waitGet()->lock()->find($data['id']);
+        $order=UserOrder::/*where('way','manual')->*/waitGet()->lock()->find($data['id']);
         if(!$order){
             Db::rollback();
-            $this->error('订单不存在');
+            $this->error('订单不存在或已经被接单');
         }
 
         $order->manualGet($getUser,$sendUser);