Merge pull request 'fix(xlsx): 修复订单列表合计预收计算错误' (#309) from dev into main

Reviewed-on: #309
This commit is contained in:
mkm 2024-11-07 16:03:39 +08:00
commit 0a1d9c00e1

View File

@ -126,7 +126,7 @@ class OrderList
$sheet->setCellValue('G' . ($count + 7),'押金');
$sheet->setCellValue('H' . ($count + 7),$order['deposit'].'元');
$sheet->setCellValue('I' . ($count + 7),'合计预收');
$sheet->setCellValue('J' . ($count + 7),bcadd($order['deposit'],$order['total_price']).'元');
$sheet->setCellValue('J' . ($count + 7),bcadd($order['deposit']??0,$order['total_price']).'元');
$sheet->setCellValue('L' . ($count + 7),'接单员');
$sheet->setCellValue('M' . ($count + 7),$order['admin_name']);
$sheet->setCellValue('O' . ($count + 7),'分单员');