From aafe828da740702994e1a2106cad712ab9418ccb Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 20 Jun 2024 14:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=95=86=E5=93=81=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/controller/WorkbenchController.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/store/controller/WorkbenchController.php b/app/store/controller/WorkbenchController.php
index 6617466ca..92188eed8 100644
--- a/app/store/controller/WorkbenchController.php
+++ b/app/store/controller/WorkbenchController.php
@@ -102,9 +102,21 @@ class WorkbenchController extends BaseAdminController
     // ]
     public function get_basic(\app\admin\controller\WorkbenchController $workbench)
     {
-        $params = $this->request->get();
-        $params['store_id'] = $this->request->adminInfo['store_id'];
-        return $workbench->get_basic();
+        $dateRange = $this->request->get('date');
+        // 拆分日期范围
+        list($startDate, $endDate) = explode('-', $dateRange);
+        $startTime = str_replace('/', '-', $startDate);
+        $endTime = str_replace('/', '-', $endDate);
+        if (empty($startTime)) { //如果没有传开始时间，则默认获取最近7天的数据
+            $startTime = strtotime(date('Y-m-d'));
+            $endTime = $startTime + 86400;
+        }
+        $where = [
+            ['create_time', 'between', [$startTime, $endTime]],
+            ['store_id','=',$this->request->adminInfo['store_id']]
+        ];
+        $data = \app\admin\logic\WorkbenchLogic::get_basic($where);
+        return $this->data($data);
     }
 
     // #[