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

Merge pull request 'dev' (#275) from dev into main

Browse Source 
Reviewed-on: #275
This commit is contained in:
mkm 2024-10-15 16:52:31 +08:00
commit ce310c67c8
2 changed files with 3 additions and 1 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

@ -28,7 +28,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
public function setSearch(): array public function setSearch(): array
{ {
return [ return [
'=' => ['store_id', 'order_id', 'uid','paid','status','order_type'], '=' => ['store_id', 'order_id', 'uid','paid','status','order_type','order_sn'],
]; ];
} }

2
app/admin/logic/beforehand_order/BeforehandOrderLogic.php
View File

@ -16,6 +16,7 @@ use app\common\model\store_order\StoreOrder;
use app\common\model\store_order_cart_info\StoreOrderCartInfo; use app\common\model\store_order_cart_info\StoreOrderCartInfo;
use app\common\model\store_product\StoreProduct; use app\common\model\store_product\StoreProduct;
use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\store_product_unit\StoreProductUnit;
use app\common\model\system_store\SystemStore;
use app\common\model\user\User; use app\common\model\user\User;
use app\common\model\user\UserAddress; use app\common\model\user\UserAddress;
use app\common\model\warehouse_order\WarehouseOrder; use app\common\model\warehouse_order\WarehouseOrder;
@ -436,6 +437,7 @@ class BeforehandOrderLogic extends BaseLogic
$arr = StoreCategory::where('id', 'in', $top_cate_list)->field('name,id')->select(); $arr = StoreCategory::where('id', 'in', $top_cate_list)->field('name,id')->select();
$res['top_cate'] = $arr?->toArray(); $res['top_cate'] = $arr?->toArray();
} }
$res['system_store']=SystemStore::where('id',$res['store_id'])->value('name');
return $res; return $res;
} }
} }