From d87a143d7422abf2aa1158f5bb47bfe57f2187b0 Mon Sep 17 00:00:00 2001 From: gongfuxiang Date: Thu, 21 Apr 2022 20:42:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E5=92=8C=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=92=A9=E5=AD=90=E5=8F=8A=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Brand.php | 18 ++++++++---------- app/service/BrandService.php | 25 ++++++++++++++++++++----- app/service/GoodsService.php | 23 +++++++++++++++-------- app/service/SearchService.php | 4 +++- 4 files changed, 46 insertions(+), 24 deletions(-) diff --git a/app/admin/controller/Brand.php b/app/admin/controller/Brand.php index a59af4c5d..a59fc9a39 100755 --- a/app/admin/controller/Brand.php +++ b/app/admin/controller/Brand.php @@ -91,16 +91,13 @@ class Brand extends Common { if(!empty($this->data_request['id'])) { - // 条件 - $where = [ - ['id', '=', intval($this->data_request['id'])], - ]; - // 获取列表 $data_params = [ 'm' => 0, 'n' => 1, - 'where' => $where, + 'where' => [ + ['id', '=', intval($this->data_request['id'])], + ], ]; $ret = BrandService::BrandList($data_params); $data = (empty($ret['data']) || empty($ret['data'][0])) ? [] : $ret['data'][0]; @@ -126,12 +123,13 @@ class Brand extends Common if(!empty($params['id'])) { // 获取列表 - $data_params = array( + $data_params = [ 'm' => 0, 'n' => 1, - 'where' => ['id'=>intval($params['id'])], - 'field' => '*', - ); + 'where' => [ + ['id', '=', intval($params['id'])] + ], + ]; $ret = BrandService::BrandList($data_params); $data = empty($ret['data'][0]) ? [] : $ret['data'][0]; } diff --git a/app/service/BrandService.php b/app/service/BrandService.php index d69a44866..120f58ae6 100755 --- a/app/service/BrandService.php +++ b/app/service/BrandService.php @@ -39,10 +39,24 @@ class BrandService $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 10; + // 品牌列表读取前钩子 + $hook_name = 'plugins_service_brand_list_begin'; + MyEventTrigger($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'where' => &$where, + 'field' => &$field, + 'order_by' => &$order_by, + 'm' => &$m, + 'n' => &$n, + ]); + // 获取列表 - $data = self::DataHandle(Db::name('Brand')->where($where)->field($field)->order($order_by)->limit($m, $n)->select()->toArray()); - - return DataReturn('处理成功', 0, $data); + $data = Db::name('Brand')->where($where)->field($field)->order($order_by)->limit($m, $n)->select()->toArray(); + + // 数据处理 + return DataReturn('处理成功', 0, self::DataHandle($data, $params)); } /** @@ -52,9 +66,10 @@ class BrandService * @version 1.0.0 * @date 2021-01-11 * @desc description - * @param [array] $data [列表数据] + * @param [array] $data [列表数据] + * @param [array] $params [输入参数] */ - public static function DataHandle($data) + public static function DataHandle($data, $params = []) { if(!empty($data)) { diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php index ff644eb93..71a8744e6 100755 --- a/app/service/GoodsService.php +++ b/app/service/GoodsService.php @@ -151,20 +151,27 @@ class GoodsService */ public static function GoodsCategoryList($params = []) { - // 条件、附加必须启用状态 $where = empty($params['where']) ? [] : $params['where']; - - // 增加启用条件 $where[] = ['is_enable', '=', 1]; - - // 数量、默认0,0则全部 + $order_by = empty($params['order_by']) ? 'sort asc' : trim($params['order_by']); + $field = empty($params['field']) ? 'id,pid,icon,name,vice_name,describe,bg_color,big_images,sort,is_home_recommended,seo_title,seo_keywords,seo_desc' : $params['field']; $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 0; - // 排序 - $order_by = empty($params['order_by']) ? 'sort asc' : trim($params['order_by']); + // 商品分类列表读取前钩子 + $hook_name = 'plugins_service_goods_category_list_begin'; + MyEventTrigger($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'where' => &$where, + 'field' => &$field, + 'order_by' => &$order_by, + 'm' => &$m, + 'n' => &$n, + ]); - $field = empty($params['field']) ? 'id,pid,icon,name,vice_name,describe,bg_color,big_images,sort,is_home_recommended,seo_title,seo_keywords,seo_desc' : $params['field']; + // 获取商品分类数据 $data = Db::name('GoodsCategory')->field($field)->where($where)->order($order_by)->limit($m, $n)->select()->toArray(); return self::GoodsCategoryDataHandle($data); } diff --git a/app/service/SearchService.php b/app/service/SearchService.php index 0304509e3..44516ca16 100755 --- a/app/service/SearchService.php +++ b/app/service/SearchService.php @@ -596,7 +596,9 @@ class SearchService { $data_params = [ 'field' => 'id,name,describe,logo,website_url', - 'where' => ['id'=>intval($params['brand_id'])], + 'where' => [ + ['id', '=', intval($params['brand_id'])] + ], 'm' => 0, 'n' => 1, ]; -- GitLab