|
|
@@ -44,12 +44,7 @@ class GoodsService extends BaseService
|
|
|
{
|
|
|
$query = $this->getQuery($params);
|
|
|
$list = $query
|
|
|
- ->with(['store', 'category'])
|
|
|
- ->where(function ($query) use ($params) {
|
|
|
- if (isset($params['store_id']) && $params['store_id'] > 0) {
|
|
|
- $query->where('store_id', $params['store_id']);
|
|
|
- }
|
|
|
- })
|
|
|
+ ->with(['category'])
|
|
|
->orderBy('create_time', 'desc')
|
|
|
->orderBy('id', 'desc')
|
|
|
->paginate($pageSize > 0 ? $pageSize : 9999999);
|
|
|
@@ -60,13 +55,6 @@ class GoodsService extends BaseService
|
|
|
$item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
|
|
|
$item['status_text'] = $this->getStatusText($item['status'] ?? 1);
|
|
|
|
|
|
- // 商家名称
|
|
|
- if (isset($item['store']) && !empty($item['store'])) {
|
|
|
- $item['store_name'] = $item['store']['name'] ?? '平台商品';
|
|
|
- } else {
|
|
|
- $item['store_name'] = $item['store_id'] > 0 ? '未知商家' : '平台商品';
|
|
|
- }
|
|
|
-
|
|
|
// 分类名称
|
|
|
if (isset($item['category']) && !empty($item['category'])) {
|
|
|
$item['category_name'] = $item['category']['name'] ?? '未分类';
|