From 35c39f40da06e19ea0187ef8dbc3f0eee63913ae Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 30 Nov 2024 15:12:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E5=A2=9E=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=87=BA=E5=BA=93=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8F=8A=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beforehand_order/BeforehandOrderLists.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/admin/lists/beforehand_order/BeforehandOrderLists.php b/app/admin/lists/beforehand_order/BeforehandOrderLists.php index 0dbb9c97b..c49ee3872 100644 --- a/app/admin/lists/beforehand_order/BeforehandOrderLists.php +++ b/app/admin/lists/beforehand_order/BeforehandOrderLists.php @@ -145,6 +145,8 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte $address = ''; $arrival_time = ''; $pay_price = ''; + $warehousing_price=''; + $outbound_price=''; if($export==2){ if($item['order_sn']!=''){ $find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type,pay_price')->find(); @@ -179,10 +181,18 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte } } if($item['warehousing_id']>0){ - $order_rk=WarehouseOrder::where('id',$item['warehousing_id'])->value('code'); + $warehouseOrder=WarehouseOrder::where('id',$item['warehousing_id'])->field('code,total_price')->find(); + if($warehouseOrder){ + $order_rk=$warehouseOrder['code']; + $warehousing_price=$warehouseOrder['total_price']; + } } if($item['outbound_id']>0){ - $order_ck=WarehouseOrder::where('id',$item['outbound_id'])->value('code'); + $warehouseOrder=WarehouseOrder::where('id',$item['outbound_id'])->field('code,total_price')->find(); + if($warehouseOrder){ + $order_ck=$warehouseOrder['code']; + $outbound_price=$warehouseOrder['total_price']; + } } $nickname = $item->other_data?->nickname??''; $phone = $item->other_data?->phone??''; @@ -193,6 +203,8 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte $item['pay_type_name'] = $pay_type_name; $item['order_ck'] = $order_ck; $item['order_rk'] = $order_rk; + $item['warehousing_price']=$warehousing_price; + $item['outbound_price']=$outbound_price; $item['nickname'] = $nickname; $item['phone'] = $phone; $item['address'] = $address; @@ -245,7 +257,9 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte 'system_store' => '门店', 'admin_name' => '门店', 'warehousing' => '入库', + 'warehousing_price' => '入库金额', 'outbound' => '出库', + 'outbound_price' => '出库金额', 'total_price' => '总价', 'admin_name' => '用户', 'mark' => '备注',