diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index 47e7c0444..e34590092 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -8,6 +8,7 @@ use app\common\model\beforehand_order\BeforehandOrder; use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin; use app\common\model\purchase_product_offer\PurchaseProductOffer; +use app\common\model\system_store\SystemStore; /** * 预订单表列表 @@ -76,12 +77,16 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte } $item['warehousing']=''; $item['outbound']=''; + $item['system_store']=''; if($item['warehousing_id']>0){ $item->warehousing='已入库|'.$item['warehousing_id']; } if($item['outbound_id']>0){ $item->outbound='已出库|'.$item['outbound_id']; } + if($item['store_id']>0){ + $item->system_store=SystemStore::where(['id'=>$item['store_id']])->value('name'); + } }) ->toArray(); } diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index 4cbb15542..cd3bd8c7e 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -68,6 +68,7 @@ class BeforehandOrderLogic extends BaseLogic $order = BeforehandOrder::create([ 'order_id' => getNewOrderId('YG'), 'admin_id' => $params['admin_id'] ?? 0, + 'store_id' => $params['store_id'] ?? 0, 'uid' => $uid, 'total_num' => $total_num, 'total_price' => $total_price,