|
|
@@ -72,7 +72,7 @@ class GoodsService extends BaseService
|
|
|
*/
|
|
|
public function getDataList($params, $pageSize = 12, $userId = 0)
|
|
|
{
|
|
|
- $list = $this->model->with(['skuList'])->from('goods as a')
|
|
|
+ $model = $this->model->with(['skuList'])->from('goods as a')
|
|
|
->where(['a.status' => 1, 'a.mark' => 1])
|
|
|
->where('a.cost_price', '>', 0)
|
|
|
->where(function ($query) use ($params) {
|
|
|
@@ -91,9 +91,16 @@ class GoodsService extends BaseService
|
|
|
}
|
|
|
|
|
|
})
|
|
|
- ->select(['a.*'])
|
|
|
- ->orderBy('a.sales', 'desc')
|
|
|
- ->orderBy('a.create_time', 'desc')
|
|
|
+ ->select(['a.*']);
|
|
|
+
|
|
|
+ // 排序
|
|
|
+ $sortType = isset($params['sort_type'])? $params['sort_type'] : 1;
|
|
|
+ if ($sortType == 2){
|
|
|
+ $model = $model->orderBy('a.sales', 'desc');
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ $list = $model->orderBy('a.create_time', 'desc')
|
|
|
->paginate($pageSize > 0 ? $pageSize : 9999999);
|
|
|
$list = $list ? $list->toArray() : [];
|
|
|
if ($list) {
|
