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); } // #[