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

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

Browse Source 
Reviewed-on: #268
This commit is contained in:
mkm 2024-10-15 13:11:37 +08:00
commit 021eeb337f
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ use app\common\model\beforehand_order\BeforehandOrder;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\auth\Admin; use app\common\model\auth\Admin;
use app\common\model\purchase_product_offer\PurchaseProductOffer; 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['warehousing']='';
$item['outbound']=''; $item['outbound']='';
$item['system_store']='';
if($item['warehousing_id']>0){ if($item['warehousing_id']>0){
$item->warehousing='已入库|'.$item['warehousing_id']; $item->warehousing='已入库|'.$item['warehousing_id'];
} }
if($item['outbound_id']>0){ if($item['outbound_id']>0){
$item->outbound='已出库|'.$item['outbound_id']; $item->outbound='已出库|'.$item['outbound_id'];
} }
if($item['store_id']>0){
$item->system_store=SystemStore::where(['id'=>$item['store_id']])->value('name');
}
}) })
->toArray(); ->toArray();
} }

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

@ -68,6 +68,7 @@ class BeforehandOrderLogic extends BaseLogic
$order = BeforehandOrder::create([ $order = BeforehandOrder::create([
'order_id' => getNewOrderId('YG'), 'order_id' => getNewOrderId('YG'),
'admin_id' => $params['admin_id'] ?? 0, 'admin_id' => $params['admin_id'] ?? 0,
'store_id' => $params['store_id'] ?? 0,
'uid' => $uid, 'uid' => $uid,
'total_num' => $total_num, 'total_num' => $total_num,
'total_price' => $total_price, 'total_price' => $total_price,
@ -376,6 +377,7 @@ class BeforehandOrderLogic extends BaseLogic
$order = BeforehandOrder::create([ $order = BeforehandOrder::create([
'order_id' => getNewOrderId('YG'), 'order_id' => getNewOrderId('YG'),
'order_sn' => $order['order_id'], 'order_sn' => $order['order_id'],
'store_id' => $order['store_id'],
'admin_id' => $params['admin_id'] ?? 0, 'admin_id' => $params['admin_id'] ?? 0,
'uid' => $uid, 'uid' => $uid,
'total_num' => $total_num, 'total_num' => $total_num,