配送统计-列表和详情完成，还差导出

app/Admin/Controllers/v3/OrderDeliveryReportController.php

@@ -63,7 +63,9 @@ class OrderDeliveryReportController extends AdminController
                 ->modal(function($modal){
                     $name = $this->name;
                     $modal->title($name.'的配送明细');
-                    $table = OrderDeliveryById::make(['horseman_id'=>$this->horseman_id]);
+                    $startTime = request()->input('start_time') ?? null;
+                    $endTime = request()->input('end_time') ?? null;
+                    $table = OrderDeliveryById::make(['horseman_id'=>$this->horseman_id,'start_time'=>$startTime, 'end_time'=>$endTime]);
                     return $table;
                 });
             $grid->column('total_delivery','总配送费');

app/Admin/Renderable/OrderDeliveryById.php

@@ -17,21 +17,21 @@ class OrderDeliveryById extends LazyRenderable
         $horsemanId = $this->horseman_id ?? 0;
         $startTime = $this->start_time ?? null;
         $endTime = $this->end_time ?? null;
-        $model = OrderMainModel::where('type',1)->where('shipping_type',1)->whereIn('state',OrderMainModel::ORDER_STATE_REBATES);
+        $model = OrderMainModel::where('type',1)->where('shipping_type',1)->whereIn('state',OrderMainModel::ORDER_STATE_FINISH);
         if($horsemanId > 0){
             $model->where('horseman_id',$horsemanId);
         }
         if($startTime){
-            $model->where('created_at','>=',$startTime);
+            $startTime = $startTime.' 00:00:00';
+            $model->where('created_at','>=',strtotime($startTime));
         }
         if($endTime){
-            $model->where('created_at','<=',$endTime);
+            $endTime = $endTime.' 23:59:59';
+            $model->where('created_at','<=',strtotime($endTime));
         }
         return Grid::make($model, function (Grid $grid) {
             $marketList = MarketModel::getMarketArray(); 
 
-            $grid->column('horseman_id','配送员ID');
-            // $grid->column('user_id','配送员姓名');
             $grid->column('global_order_id','订单编号');
             $grid->column('market_id','下单市场')->display(function($marketId) use($marketList){
                 return $marketList[$marketId] ?? '';

app/Admin/Repositories/v3/OrderDeliveryReport.php

@@ -62,7 +62,7 @@ class OrderDeliveryReport extends EloquentRepository
             ->join(EmployeesModel::TABLE_NAME,EmployeesModel::TABLE_NAME.'.id','=',Model::$tableName.'.horseman_id','left')   
             ->where(Model::$tableName.'.type',1)
             ->where('shipping_type',1)
-            ->whereIn('state',[4,5,10,11]);
+            ->whereIn('state',Model::ORDER_STATE_FINISH);
 
         if($userId){
             $model->where(EmployeesModel::TABLE_NAME.'.user_id',$userId);