From 6c7d09acd8be9c3611e23bb46746e1a00cbd5a93 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 9 Dec 2023 18:14:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Logistics.php | 26 +++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/controller/api/dataview/Logistics.php b/app/controller/api/dataview/Logistics.php
index 5435f8ef..e8811b1b 100755
--- a/app/controller/api/dataview/Logistics.php
+++ b/app/controller/api/dataview/Logistics.php
@@ -193,22 +193,36 @@ class Logistics extends BaseController
     {
         $type = $this->request->param('type');
         $courierId = $this->request->param('courier_id');
+        $startTime = $this->request->param('start_time');
+        $endTime = $this->request->param('end_time');
         $list = [];
         $count = 0;
         if ($type == 1) {
             // 待取货
-            $list = Db::connect('logistics')->name('logistics')->where(['status'=>0, 'courier_id'=>$courierId])->select();
-            $count = Db::connect('logistics')->name('logistics')->where(['status'=>0, 'courier_id'=>$courierId])->count();
+            $list = Db::connect('logistics')->name('logistics')->where(['status'=>0, 'courier_id'=>$courierId])->when($startTime&&$endTime,function ($query) use ($startTime, $endTime){
+                $query->whereBetween('qh_time', [$startTime, $endTime]);
+            })->select();
+            $count = Db::connect('logistics')->name('logistics')->where(['status'=>0, 'courier_id'=>$courierId])->when($startTime&&$endTime,function ($query) use ($startTime, $endTime){
+                $query->whereBetween('qh_time', [$startTime, $endTime]);
+            })->count();
         }
         if ($type == 2) {
             // 配送中
-            $list = Db::connect('logistics')->name('logistics')->where(['status'=>1, 'courier_id'=>$courierId])->select();
-            $count = Db::connect('logistics')->name('logistics')->where(['status'=>1, 'courier_id'=>$courierId])->count();
+            $list = Db::connect('logistics')->name('logistics')->where(['status'=>1, 'courier_id'=>$courierId])->when($startTime&&$endTime,function ($query) use ($startTime, $endTime){
+                $query->whereBetween('create_time', [$startTime, $endTime]);
+            })->select();
+            $count = Db::connect('logistics')->name('logistics')->where(['status'=>1, 'courier_id'=>$courierId])->when($startTime&&$endTime,function ($query) use ($startTime, $endTime){
+                $query->whereBetween('create_time', [$startTime, $endTime]);
+            })->count();
         }
         if ($type == 3) {
             // 已完成
-            $list = Db::connect('logistics')->name('logistics')->where([['status', 'in', [2,3]], 'courier_id'=>$courierId])->select();
-            $count = Db::connect('logistics')->name('logistics')->where([['status', 'in', [2,3]], 'courier_id'=>$courierId])->count();
+            $list = Db::connect('logistics')->name('logistics')->where([['status', 'in', [2,3]], 'courier_id'=>$courierId])->when($startTime&&$endTime,function ($query) use ($startTime, $endTime){
+                $query->whereBetween('ps_time', [$startTime, $endTime]);
+            })->select();
+            $count = Db::connect('logistics')->name('logistics')->where([['status', 'in', [2,3]], 'courier_id'=>$courierId])->when($startTime&&$endTime,function ($query) use ($startTime, $endTime){
+                    $query->whereBetween('ps_time', [$startTime, $endTime]);
+                })->count();
         }
         return app('json')->success(compact('count', 'list'));
     }