diff --git a/admin/controllers/stats/Order.php b/admin/controllers/stats/Order.php index 444f8960..893c5ec7 100644 --- a/admin/controllers/stats/Order.php +++ b/admin/controllers/stats/Order.php @@ -63,7 +63,9 @@ class order extends HD_Controller $config['bizs'] = [ 1 => ['biz_name' => '泉州零跑品牌店', 'ids' => '63', 'rowspan' => 1], 2 => ['biz_name' => '泉州渠道', 'not_ids' => '63', 'city_id' => '350500', 'show' => 'order'], - 3 => ['biz_name' => '厦门渠道', 'city_id' => '350200', 'show' => 'order']]; + 3 => ['biz_name' => '厦门渠道', 'city_id' => '350200', 'show' => 'order'], + 4 => ['biz_name' => '福州渠道', 'city_id' => '350100', 'show' => 'order'], + ]; $res = $this->commonSelect($params, $config); $this->data['info'] = $res['info']; $this->data['params'] = $res['params']; @@ -86,7 +88,10 @@ class order extends HD_Controller 2 => ['biz_name' => '宁德哪吒代理店', 'type' => 3, 'city_id' => '350900', 'show' => 'order'], 3 => ['biz_name' => '厦门哪吒订单中心', 'city_id' => '350200', 'show' => 'order'], 4 => ['biz_name' => '泉州哪吒订单中心', 'city_id' => '350500', 'show' => 'order'], - 5 => ['biz_name' => '福州哪吒订单中心', 'city_id' => '350100', 'show' => 'order']]; + 5 => ['biz_name' => '福州哪吒订单中心', 'city_id' => '350100', 'show' => 'order'], + 6 => ['biz_name' => '哪吒品牌店', 'type' => 1, 'show' => 'order'], + 7 => ['biz_name' => '哪吒代理店', 'type' => 3, 'show' => 'order'], + ]; $res = $this->commonSelect($params, $config); $this->data['info'] = $res['info']; $this->data['params'] = $res['params']; @@ -397,7 +402,7 @@ class order extends HD_Controller foreach ($bizs as $k => $v) { $str_ids = $v['ids'] ? $v['ids'] : ''; if (!$str_ids) { - $where_b = ['city_id' => $v['city_id']]; + $where_b = $v['city_id'] ? ['city_id' => $v['city_id']] : []; $v['type'] && $where_b['type'] = $v['type']; $v['not_ids'] && $where_b["id not in({$v['not_ids']})"] = null; $res = $this->mdBiz->select($where_b, 'id desc', 0, 0, 'id');