lszyh
haoyuntao 4 months ago
parent 52e8b7baa9
commit 7a05256ba3
  1. 9
      app/admin/controller/RetailDescribe.php
  2. 6
      app/api/controller/Retail.php
  3. 41
      app/store/model/RetailDescribe.php

@ -18,12 +18,9 @@ class RetailDescribe extends Controller
public function index()
{
$model = new retDescribeModel;
$list = $model->getAll();
$grouped = [];
foreach ($list as $item) {
$grouped[$item['plate_id']][] = $item;
}
return $this->renderSuccess(compact('grouped'));
$where = $this->request->get();
$list = $model->getList($where);
return $this->renderSuccess(compact('list'));
}
public function add(){

@ -96,11 +96,7 @@ class Retail extends Controller
public function describe()
{
$list = RetailDescribeModel::withoutGlobalScope()->select();
$grouped = [];
foreach ($list as $item) {
$grouped[$item['plate_id']][] = $item;
}
return $this->renderSuccess(compact('grouped'));
return $this->renderSuccess(compact('list'));
}

@ -17,10 +17,14 @@ use app\common\model\RetailDescribe as retDescribeModel;
class RetailDescribe extends RetDescribeModel
{
public function getAll()
{
return self::select();
public function getList(array $param = []): \think\Paginator
{
// 设置查询条件
$filter = $this->getFilter($param);
$list = $this->field('*')
->where($filter)
->paginate($param['pageSize'] ?? 15);
return $list;
}
public function detail(int $id){
@ -36,5 +40,34 @@ class RetailDescribe extends RetDescribeModel
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' => '', // 查询内容
'wholesale' => 0, // 批发商城
'retail' => 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['wholesale'] > 0 && $filter[] = ['wholesale', '=', (int)$params['wholesale']];
$params['retail'] > 0 && $filter[] = ['retail', '=', (int)$params['retail']];
// 支付状态
$params['description_status'] > 0 && $filter[] = ['description_status', '=', (int)$params['description_status']];
return $filter;
}
}
Loading…
Cancel
Save