Merge branch 'zzzyh' into fxshop

app/store/model/RetailDescribe.php

@@ -39,77 +39,6 @@ class RetailDescribe extends RetDescribeModel
         return $this->where('id' ,$id)->update($data);
     }
 
-    public function del(array $id){
-        return $this->whereIn('id' ,$id)->delete();
-    }
-
-             /**
-     * 设置查询条件
-     * @param array $param
-     * @return array
-     */
-    private function getFilter(array $param): array
-    {
-        // 设置默认的检索数据
-        $params = $this->setQueryDefaultValue($param, [
-            'plate_id' => 0,          // 类型id
-            'search' => '',          // 查询内容
-            'type' => 0,    // 商城类型
-            'description_status' => 0, // 状态
-        ]);
-        // 检索查询条件
-        $filter = [];
-        // 类型id
-        $params['plate_id'] > 0 && $filter[] = ['plate_id', '=', $params['plate_id']];
-        // 用户昵称/订单号
-        !empty($params['search']) && $filter[] = ['feature|function_description', 'like', "%{$params['search']}%"];
-        // 批发商城类型
-        $params['type'] > 0 && $filter[] = ['type', '=', (int)$params['type']];
-        // 支付状态
-        $params['description_status'] > 0 && $filter[] = ['description_status', '=', (int)$params['description_status']];
-        return $filter;
-    }
-}<?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
-declare (strict_types=1);
-
-namespace app\store\model;
-
-use app\common\model\RetailDescribe as retDescribeModel;
-
-class RetailDescribe extends RetDescribeModel
-{
-
-    public function getList(array $param = []): \think\Paginator
-    {   
-        // 设置查询条件
-        $filter = $this->getFilter($param);
-        $list = $this->field('*')
-        ->where($filter)
-        ->order(['create_time' => 'asc','sort' => 'asc'])
-        ->paginate($param['pageSize'] ?? 15);
-        return $list;
-    }
-
-    public function detail(int $id){
-        return self::where('id',$id)->find();
-    }
-
-    public function add(array $data){
-        return $this->save($data);
-    }
-    public function edit(int $id ,array $data){
-        return $this->where('id' ,$id)->update($data);
-    }
-
     public function del(array $id){
         return $this->whereIn('id' ,$id)->delete();
     }