From 325098867744a0f26f169755e21720fc3b983976 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Mon, 26 Oct 2020 11:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/v3/OrderMain.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Model/v3/OrderMain.php b/app/Model/v3/OrderMain.php
index f0f1841..543061d 100644
--- a/app/Model/v3/OrderMain.php
+++ b/app/Model/v3/OrderMain.php
@@ -75,8 +75,12 @@ class OrderMain extends Model
 
     public function getStateTextAttribute()
     {
-        if ($this->attributes['state'] == OrderState::DELIVERY && $this->attributes['shipping_type'] == 3) {
+        if ($this->attributes['state'] == OrderState::DELIVERY) {
+            if($this->attributes['shipping_type'] == 3) {
                 return '待自提';
+            }elseif ($this->attributes['shipping_type'] == 1 && !$this->attributes['horseman_id']){
+                return '已接单';
+            }
         }
 
         return OrderState::getMessage($this->attributes['state']);