From 34e7b2f3e9ee407f0a96328dfd0c0cf3aa6b4cb3 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Tue, 15 Sep 2020 15:47:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=91=E6=89=8B=E6=94=B9=E7=94=A8=E6=87=92?=
 =?UTF-8?q?=E6=97=8F=E5=91=98=E5=B7=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImsCjdcOrderMainController.php            |  2 --
 app/Admin/Forms/SelectHorseman.php            |  4 ++--
 app/Models/LanzuServiceHorseman.php           |  1 +
 app/Models/v3/LanzuEmployees.php              | 21 ++++++++++++++++++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index d783935..32025ef 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -55,7 +55,6 @@ class ImsCjdcOrderMainController extends AdminController
             $grid->created_at('下单时间')->display(function ($time) {
                 return date('Y-m-d H:i:s',$time);
             });
-
             $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) {
 
                 $state = $actions->row->state;
@@ -83,7 +82,6 @@ class ImsCjdcOrderMainController extends AdminController
             $grid->disableEditButton();
             $grid->disableDeleteButton();
 
-
         });
     }
 
diff --git a/app/Admin/Forms/SelectHorseman.php b/app/Admin/Forms/SelectHorseman.php
index dd2d1a4..149b09a 100644
--- a/app/Admin/Forms/SelectHorseman.php
+++ b/app/Admin/Forms/SelectHorseman.php
@@ -4,6 +4,7 @@ namespace App\Admin\Forms;
 
 use App\Models\ImsCjdcOrderMain;
 use App\Models\LanzuServiceHorseman;
+use App\Models\v3\LanzuEmployees;
 use Dcat\Admin\Widgets\Form;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -36,9 +37,8 @@ class SelectHorseman extends Form
      */
     public function form()
     {
-
         $this->select('horseman_id','配送员')
-            ->options(LanzuServiceHorseman::getHorseman())
+            ->options(LanzuEmployees::getHorseman())
             ->required();
         $this->hidden('order_id')->value($this->data['order_id']);
         $this->hidden('current_page')->value($this->data['current_page']);
diff --git a/app/Models/LanzuServiceHorseman.php b/app/Models/LanzuServiceHorseman.php
index d230d2f..868cde9 100644
--- a/app/Models/LanzuServiceHorseman.php
+++ b/app/Models/LanzuServiceHorseman.php
@@ -38,4 +38,5 @@ class LanzuServiceHorseman extends Model
             return '--';
         }
     }
+
 }
diff --git a/app/Models/v3/LanzuEmployees.php b/app/Models/v3/LanzuEmployees.php
index d213617..b5125ec 100644
--- a/app/Models/v3/LanzuEmployees.php
+++ b/app/Models/v3/LanzuEmployees.php
@@ -37,7 +37,7 @@ class LanzuEmployees extends Model
         $value = $value ? $value : $this->status;
         return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : '';
     }
-    
+
     /**
      * 根据id获取单条信息
      * @param int $id
@@ -69,4 +69,23 @@ class LanzuEmployees extends Model
             return array_flip($list);
         }
     }
+
+    public static function getHorseman($marketId=null)
+    {
+        if ($marketId){
+            $rows = self::where('market_id',$marketId)
+                ->where('position','REGEXP','"29"')
+                ->get();
+        }else{
+            $rows = self::where('position','REGEXP','"29"')->get();
+        }
+        $item         = [];
+        if ($rows){
+            foreach ($rows as $row) {
+                $item[$row->id]   = $row->name;
+            }
+        }
+        return $item;
+    }
+
 }