|
|
@@ -59,20 +59,21 @@ class EnshrineOrdersService extends BaseService
|
|
|
$pageSize = isset($params['pageSize']) ? intval($params['pageSize']) : PERPAGE;
|
|
|
|
|
|
$dataList = $this->model::from('enshrine_orders as o')
|
|
|
- ->leftJoin('enshrine_records as g', 'g.id', '=', 'o.source_id')
|
|
|
+ ->leftJoin('enshrine_records as r', 'r.id', '=', 'o.source_id')
|
|
|
+ ->leftJoin('offerings as g', 'g.id', '=', 'o.goods_id')
|
|
|
->leftJoin('member as m', 'm.id', '=', 'o.user_id')
|
|
|
->where(function ($query) use ($params) {
|
|
|
- $query->where('g.mark',1);
|
|
|
+ $query->where('o.mark',1);
|
|
|
$status = isset($params['status']) ? $params['status'] : 0;
|
|
|
if ($status > 0) {
|
|
|
- $query->where('g.status', $status);
|
|
|
+ $query->where('o.status', $status);
|
|
|
} else {
|
|
|
- $query->where('g.status', '>', 0);
|
|
|
+ $query->where('o.status', '>', 0);
|
|
|
}
|
|
|
|
|
|
$type = isset($params['type']) ? $params['type'] : 0;
|
|
|
if ($type > 0) {
|
|
|
- $query->where('g.type', $type);
|
|
|
+ $query->where('o.type', $type);
|
|
|
}
|
|
|
|
|
|
})
|
|
|
@@ -83,7 +84,7 @@ class EnshrineOrdersService extends BaseService
|
|
|
->orWhere('m.nickname', 'like', "%{$keyword}%");
|
|
|
}
|
|
|
})
|
|
|
- ->select(['o.*','g.image as thumb','m.nickname','m.mobile'])
|
|
|
+ ->select(['o.*','g.icon as thumb','m.nickname','m.mobile'])
|
|
|
->orderBy('o.create_time', 'desc')
|
|
|
->paginate($pageSize);
|
|
|
|
