mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '修改预定单查询、商品查询' (#383) from dev into main

Browse Source 
Reviewed-on: #383
This commit is contained in:
mkm 2024-12-12 11:37:28 +08:00
commit fc5d749800
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/admin/lists/beforehand_order/BeforehandOrderLists.php
View File

@ -34,7 +34,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
{ {
return [ return [
'=' => ['store_id', 'paid', 'status', 'order_type'], '=' => ['store_id', 'paid', 'status', 'order_type'],
'%like' => ['order_id','order_sn'], '%like' => ['order_id','order_sn', 'mark'],
'between_time' => 'create_time' 'between_time' => 'create_time'
]; ];
} }

11
app/admin/lists/store_product/StoreProductLists.php
View File

@ -68,8 +68,15 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
if (!empty($this->params['user_id'])) { if (!empty($this->params['user_id'])) {
$userShip = User::where('id', $this->params['user_id'])->value('user_ship'); $userShip = User::where('id', $this->params['user_id'])->value('user_ship');
} }
$list = StoreProduct::where($this->searchWhere) $query = StoreProduct::where($this->searchWhere);
->limit($this->limitOffset, $this->limitLength) if (isset($this->params['type_filter'])) {
if ($this->params['type_filter'] == 0) {
$query->where('product_type', 6)->where('is_show', 0);
} else {
$query->where('is_show', 1);
}
}
$list = $query->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function ($item) use($is_warehouse, $userShip) { ->select()->each(function ($item) use($is_warehouse, $userShip) {
$item['product_id'] = $item['id']; $item['product_id'] = $item['id'];