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

Merge pull request 'refactor(admin): 优化订单导出逻辑' (#364) from dev into main

Browse Source 
Reviewed-on: #364
This commit is contained in:
mkm 2024-11-25 15:09:01 +08:00
commit ace7706ef2
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,8 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
$address = ''; $address = '';
$arrival_time = ''; $arrival_time = '';
$pay_price = ''; $pay_price = '';
if($export==2 && $item['order_sn']!=''){ if($export==2){
if($item['order_sn']!=''){
$find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type,pay_price')->find(); $find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type,pay_price')->find();
if($find){ if($find){
switch ($find['pay_type']) { switch ($find['pay_type']) {
@ -176,6 +177,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
$pay_status = '未付款'; $pay_status = '未付款';
} }
} }
}
if($item['warehousing_id']>0){ if($item['warehousing_id']>0){
$order_rk=WarehouseOrder::where('id',$item['warehousing_id'])->value('code'); $order_rk=WarehouseOrder::where('id',$item['warehousing_id'])->value('code');
} }