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

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

@ -145,35 +145,37 @@ 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){
$find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type,pay_price')->find(); if($item['order_sn']!=''){
if($find){ $find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type,pay_price')->find();
switch ($find['pay_type']) { if($find){
case 3: switch ($find['pay_type']) {
$pay_type_name = '余额支付'; case 3:
break; $pay_type_name = '余额支付';
case 7: break;
$pay_type_name = '微信支付'; case 7:
break; $pay_type_name = '微信支付';
case 9: break;
$pay_type_name = '微信条码'; case 9:
break; $pay_type_name = '微信条码';
case 13: break;
$pay_type_name = '支付宝条码'; case 13:
break; $pay_type_name = '支付宝条码';
case 17: break;
$pay_type_name = '现金支付'; case 17:
break; $pay_type_name = '现金支付';
case 18: break;
$pay_type_name = '采购款支付'; case 18:
break; $pay_type_name = '采购款支付';
} break;
$item['pay_type_name'] = $pay_type_name; }
if($find['paid']==1){ $item['pay_type_name'] = $pay_type_name;
$pay_status = '已付款'; if($find['paid']==1){
$pay_price = $find['pay_price']; $pay_status = '已付款';
}else{ $pay_price = $find['pay_price'];
$pay_status = '未付款'; }else{
$pay_status = '未付款';
}
} }
} }
if($item['warehousing_id']>0){ if($item['warehousing_id']>0){