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

Merge pull request 'feat(admin): 添加实际支付金额显示' (#363) from dev into main

Browse Source 
Reviewed-on: #363
This commit is contained in:
mkm 2024-11-25 11:46:12 +08:00
commit cd939278e2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,8 +144,9 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
$phone = ''; $phone = '';
$address = ''; $address = '';
$arrival_time = ''; $arrival_time = '';
$pay_price = '';
if($export==2 && $item['order_sn']!=''){ if($export==2 && $item['order_sn']!=''){
$find=StoreOrder::where('order_id',$item['order_sn'])->field('paid,pay_type')->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']) {
case 3: case 3:
@ -170,6 +171,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
$item['pay_type_name'] = $pay_type_name; $item['pay_type_name'] = $pay_type_name;
if($find['paid']==1){ if($find['paid']==1){
$pay_status = '已付款'; $pay_status = '已付款';
$pay_price = $find['pay_price'];
}else{ }else{
$pay_status = '未付款'; $pay_status = '未付款';
} }
@ -193,6 +195,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
$item['phone'] = $phone; $item['phone'] = $phone;
$item['address'] = $address; $item['address'] = $address;
$item['arrival_time'] = $arrival_time; $item['arrival_time'] = $arrival_time;
$item['pay_price'] = $pay_price;
}) })
->toArray(); ->toArray();
@ -248,6 +251,7 @@ class BeforehandOrderLists extends BaseAdminDataLists implements ListsSearchInte
'create_time' => '时间', 'create_time' => '时间',
'pay_status' => '支付状态', 'pay_status' => '支付状态',
'pay_type_name' => '支付方式', 'pay_type_name' => '支付方式',
'pay_price' => '实际支付',
'nickname' => '用户', 'nickname' => '用户',
'phone' => '手机', 'phone' => '手机',
'address' => '地址', 'address' => '地址',