diff --git a/app/Admin/Controllers/v3/OrderDeliveryReportController.php b/app/Admin/Controllers/v3/OrderDeliveryReportController.php index 3c7f138..0ba52c9 100644 --- a/app/Admin/Controllers/v3/OrderDeliveryReportController.php +++ b/app/Admin/Controllers/v3/OrderDeliveryReportController.php @@ -73,7 +73,7 @@ class OrderDeliveryReportController extends AdminController $filter->panel(); $filter->equal('start_time','开始时间')->date()->width(2); $filter->equal('end_time','结束时间')->date()->width(2); - $filter->equal('horseman_id','配送员ID'); + $filter->equal('horseman_id','配送员ID')->width(2); $filter->equal('user_id','懒ID')->width(2); $filter->equal('name','姓名')->width(2); if(!$this->marketId){ diff --git a/app/Admin/Renderable/OrderDeliveryById.php b/app/Admin/Renderable/OrderDeliveryById.php index d170b2d..f7718a6 100644 --- a/app/Admin/Renderable/OrderDeliveryById.php +++ b/app/Admin/Renderable/OrderDeliveryById.php @@ -15,11 +15,18 @@ class OrderDeliveryById extends LazyRenderable { // 获取外部传递的参数 $horsemanId = $this->horseman_id ?? 0; - $model = new OrderMainModel(); + $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); if($horsemanId > 0){ - $model->where('horseman_id',$horsemanId)->where('type',1)->where('shipping_type',1); + $model->where('horseman_id',$horsemanId); + } + if($startTime){ + $model->where('created_at','>=',$startTime); + } + if($endTime){ + $model->where('created_at','<=',$endTime); } - // dd($model->where('horseman_id',$horsemanId)); return Grid::make($model, function (Grid $grid) { $marketList = MarketModel::getMarketArray(); @@ -70,9 +77,13 @@ class OrderDeliveryById extends LazyRenderable { // 获取外部传递的参数 $horsemanId = $this->payload['horseman_id'] ?? 0; + $startTime = $this->payload['start_time'] ? request()->input('start_time') : null; + $endTime = $this->payload['end_time'] ? request()->input('end_time') : null; return [ 'horseman_id' => $horsemanId, + 'start_time' => $startTime, + 'end_time' => $endTime, ]; } } \ No newline at end of file diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php index 119acc4..332ba5a 100644 --- a/app/Models/ImsCjdcOrderMain.php +++ b/app/Models/ImsCjdcOrderMain.php @@ -40,7 +40,7 @@ class ImsCjdcOrderMain extends Model // 部分退款 const ORDER_STATE_REBATES = 11; // 完成状态组合 - const ORDER_STATE_FINISH = [self::ORDER_STATE_COMPLETE, self::ORDER_STATE_EVALUATED, self::ORDER_STATE_UNREFUND]; + const ORDER_STATE_FINISH = [self::ORDER_STATE_COMPLETE, self::ORDER_STATE_EVALUATED, self::ORDER_STATE_UNREFUND, self::ORDER_STATE_REBATES]; const STATE_LIST = [ self::ORDER_STATE_UNPAY => '待支付',