From 3dbf60b94e891daced31dd8066703b998d9dba0b Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 09:07:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=83=A8=E5=88=86=E5=AD=97=E4=BD=93=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ImsCjdcOrderMainController.php | 4 ++--
 app/Admin/Forms/SelectHorseman.php                   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index a7b3883..5d27611 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -54,14 +54,14 @@ class ImsCjdcOrderMainController extends AdminController
             $grid->order_num;
             $grid->state('订单状态')
                 ->using(config('order.state'))
-                ->label([1 => 'dark', 2 => 'danger', 3 => 'indigo', 4 => 'success',8=>'warning']);
+                ->label([1 => 'dark', 2 => 'danger', 3 => 'indigo', 4 => 'success',8=>'warning',311=>'#bd10e0']);
             $grid->money;
             $grid->column('market.name', '所属市场');
             $grid->pay_time('支付时间')->display(function ($time) {
                 if ($time){
                     return date('Y-m-d H:i:s',$time);
                 }
-                return '未支付';
+                return '<span style="color: #ceccce">未支付</span>';
             });
             $grid->created_at('下单时间')->display(function ($time) {
                 return date('Y-m-d H:i:s',$time);
diff --git a/app/Admin/Forms/SelectHorseman.php b/app/Admin/Forms/SelectHorseman.php
index e023f24..a1c936e 100644
--- a/app/Admin/Forms/SelectHorseman.php
+++ b/app/Admin/Forms/SelectHorseman.php
@@ -44,9 +44,9 @@ class SelectHorseman extends Form
             ->options(LanzuEmployees::getHorseman())
             ->required();
 
-        $this->text('order_id');
-        $this->text('current_page');
+        $this->hidden('order_id');
+        $this->hidden('current_page');
     }
-    
+
 
 }

From b5c856e970b5c28787120cb561157ff29acfad39 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 09:16:59 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E5=92=8C=E7=A6=BB=E8=81=8C=E7=9A=84=E9=AA=91=E6=89=8B=E8=BF=98?=
 =?UTF-8?q?=E5=8F=AF=E9=80=89=E6=8B=A9=E9=85=8D=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Forms/SelectHorseman.php | 3 ++-
 app/Models/v3/LanzuEmployees.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Forms/SelectHorseman.php b/app/Admin/Forms/SelectHorseman.php
index a1c936e..6d1b906 100644
--- a/app/Admin/Forms/SelectHorseman.php
+++ b/app/Admin/Forms/SelectHorseman.php
@@ -2,6 +2,7 @@
 
 namespace App\Admin\Forms;
 
+use App\Admin\Common\Auth;
 use App\Models\ImsCjdcOrderMain;
 use App\Models\LanzuServiceHorseman;
 use App\Models\v3\LanzuEmployees;
@@ -41,7 +42,7 @@ class SelectHorseman extends Form
     public function form()
     {
         $this->select('horseman_id','配送员')
-            ->options(LanzuEmployees::getHorseman())
+            ->options(LanzuEmployees::getHorseman(Auth::getMarket()))
             ->required();
 
         $this->hidden('order_id');
diff --git a/app/Models/v3/LanzuEmployees.php b/app/Models/v3/LanzuEmployees.php
index 5592698..8bf0755 100644
--- a/app/Models/v3/LanzuEmployees.php
+++ b/app/Models/v3/LanzuEmployees.php
@@ -75,9 +75,10 @@ class LanzuEmployees extends Model
         if ($marketId){
             $rows = self::where('market_id',$marketId)
                 ->where('position','REGEXP','"29"')
+                ->where('status',1)
                 ->get();
         }else{
-            $rows = self::where('position','REGEXP','"29"')->get();
+            $rows = self::where('position','REGEXP','"29"')->where('status',1)->get();
         }
         $item         = [];
         if ($rows){

From 62d6d2771a5c813978973b6ae8b33265968c74e4 Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 09:40:48 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=8C=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E5=91=98=E6=9C=AA=E6=98=BE=E7=A4=BA=EF=BC=9A=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ImsCjdcOrderMainController.php |  2 +-
 app/Admin/Forms/SelectHorseman.php                   |  5 +++--
 app/Models/ImsCjdcOrderMain.php                      |  2 +-
 app/Models/LanzuServiceHorseman.php                  |  3 ++-
 app/Models/v3/LanzuEmployees.php                     | 12 +++++++++++-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/Admin/Controllers/ImsCjdcOrderMainController.php b/app/Admin/Controllers/ImsCjdcOrderMainController.php
index 5d27611..5691890 100644
--- a/app/Admin/Controllers/ImsCjdcOrderMainController.php
+++ b/app/Admin/Controllers/ImsCjdcOrderMainController.php
@@ -155,7 +155,7 @@ class ImsCjdcOrderMainController extends AdminController
         return $content->header('订单详情')
             ->breadcrumb(
                 ['text' => '列表', 'url' => "order?page={$page}"],
-                ['text' => '详情', 'url' => 'detail'],
+                ['text' => '详情', 'url' => 'detail']
             )
             ->body(Lazy::make($detail));
     }
diff --git a/app/Admin/Forms/SelectHorseman.php b/app/Admin/Forms/SelectHorseman.php
index 6d1b906..ff1fefc 100644
--- a/app/Admin/Forms/SelectHorseman.php
+++ b/app/Admin/Forms/SelectHorseman.php
@@ -27,8 +27,9 @@ class SelectHorseman extends Form
         $hid = request()->input('horseman_id');
 
         $oid = request()->input('order_id');
-        $current_page = request()->get('current_page');
-        $result = ImsCjdcOrderMain::where('id',$oid)->update(['shipping_type'=>1,'horseman_id'=>$hid,'updated_at'=>time()]);
+        $current_page = request()->input('current_page');
+        $horseman = LanzuEmployees::getName($hid);//骑手名称
+        $result = ImsCjdcOrderMain::where('id',$oid)->update(['shipping_type'=>1,'horseman_id'=>$hid,'shipping_name'=>$horseman,'updated_at'=>time()]);
         if ($result){
             return $this->success('操作成功',"order?page={$current_page}");
         }else{
diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php
index 7976d06..4a655ee 100644
--- a/app/Models/ImsCjdcOrderMain.php
+++ b/app/Models/ImsCjdcOrderMain.php
@@ -59,7 +59,7 @@ class ImsCjdcOrderMain extends Model
         $order['updated_at'] = $order['updated_at'] ? date('Y-m-d H:i:s', $order['updated_at']) : null;
         $order['pay_type'] = config('order.pay_type')[$order['pay_type']];
         $order['shipping_type'] = config('order.shipping_type')[$order['shipping_type']];
-        $order['horseman_name'] = LanzuServiceHorseman::getName($order['horseman_id']);
+        $order['horseman_name'] = $order['shipping_name']??LanzuServiceHorseman::getName($order['horseman_id']);
 
         //获取市场经纬度
         //$market = LanzuMarket::where('id',$order['market_id'])->first()->toArray();
diff --git a/app/Models/LanzuServiceHorseman.php b/app/Models/LanzuServiceHorseman.php
index 8fba949..832bfd3 100644
--- a/app/Models/LanzuServiceHorseman.php
+++ b/app/Models/LanzuServiceHorseman.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Models\v3\LanzuEmployees;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Model;
@@ -32,7 +33,7 @@ class LanzuServiceHorseman extends Model
     {
         //获取骑手名称
         if ($hid){
-            $horseman = LanzuServiceHorseman::find($hid);
+            $horseman = LanzuEmployees::find($hid);
             if ($horseman){
                 return $horseman->name;
             }
diff --git a/app/Models/v3/LanzuEmployees.php b/app/Models/v3/LanzuEmployees.php
index 8bf0755..5ed4d81 100644
--- a/app/Models/v3/LanzuEmployees.php
+++ b/app/Models/v3/LanzuEmployees.php
@@ -88,5 +88,15 @@ class LanzuEmployees extends Model
         }
         return $item;
     }
-
+    public static function getName($hid=null)
+    {
+        //获取骑手名称
+        if ($hid){
+            $horseman = self::find($hid);
+            if ($horseman){
+                return $horseman->name;
+            }
+        }
+        return '--';
+    }
 }

From 92b6d543090e277eb043dc1f7d2f7ab9d1fc922b Mon Sep 17 00:00:00 2001
From: lanzu_qinsheng <334039090@qq.com>
Date: Fri, 18 Sep 2020 09:42:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/orderdetail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/orderdetail.php b/resources/views/orderdetail.php
index 59f2a75..708d6de 100644
--- a/resources/views/orderdetail.php
+++ b/resources/views/orderdetail.php
@@ -16,7 +16,7 @@
         </tr>
         <tr>
             <td class="text-nowrap" scope="row">预约送达时间：{{delivery_time_note}}</td>
-            <td class="text-nowrap" scope="col">配送员:{{horseman_name}}</td>
+            <td class="text-nowrap" scope="col">配送员: {{horseman_name}}</td>
         </tr>
         <tr>
             <td class="text-nowrap" scope="row">配送距离：{{distance}}</td>

From af20d57aab523a57cd90fecaf5ee0cdbbc40eae8 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 18 Sep 2020 09:55:45 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8F=AF=E5=BF=AB?=
 =?UTF-8?q?=E6=8D=B7=E7=BC=96=E8=BE=91=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/GoodsController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index c56c975..b855eb5 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -58,9 +58,10 @@ class GoodsController extends AdminController
             $grid->store_id->display(function ($storeId) use($storeList){
                 return isset($storeList[$storeId]) ? $storeList[$storeId] : '';
             });
-            $grid->category_id->display(function ($categoryId) use($categoryList){
-                return isset($categoryList[$categoryId]) ? $categoryList[$categoryId] : '';
-            });
+            $grid->category_id->select($categoryList);
+            // $grid->category_id->display(function ($categoryId) use($categoryList){
+            //     return isset($categoryList[$categoryId]) ? $categoryList[$categoryId] : '';
+            // });
             $grid->goods_category_id->display(function ($goodsCategoryId) use($goodsCategoryList){
                 return isset($goodsCategoryList[$goodsCategoryId]) ? $goodsCategoryList[$goodsCategoryId] : '';
             });