Merge branch 'hotfix-phoenix'

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);
@@ -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));
     }

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] : '';
             });

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;
@@ -26,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{
@@ -41,11 +43,11 @@ class SelectHorseman extends Form
     public function form()
     {
         $this->select('horseman_id','配送员')
-            ->options(LanzuEmployees::getHorseman())
+            ->options(LanzuEmployees::getHorseman(Auth::getMarket()))
             ->required();
 
-        $this->text('order_id');
-        $this->text('current_page');
+        $this->hidden('order_id');
+        $this->hidden('current_page');
     }
 
 

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();

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;
             }

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){
@@ -87,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 '--';
+    }
 }