This commit is contained in:
邓皓元 2019-06-10 16:24:21 +08:00
parent 46e410defa
commit 9b706bf587

View File

@ -97,11 +97,11 @@ class OrderExport extends AbstractExport implements FromQuery, WithHeadings, Wit
CompanyService::load($item['company_id'])['name'] ?? '', CompanyService::load($item['company_id'])['name'] ?? '',
$carrierOperators[$carrier_operator], $carrierOperators[$carrier_operator],
PackageService::load($item['package_id'])['name'] ?? '', PackageService::load($item['package_id'])['name'] ?? '',
sprintf('%.02f', $item['unit_price']/100), sprintf('%.02f', $item['unit_price'] / 100),
CommonService::namePayChannel($item['pay_channel']), CommonService::namePayChannel($item['pay_channel']),
"{$item['transaction_no']}\t", "{$item['transaction_no']}\t",
$item['counts'], $item['counts'],
sprintf('%.02f', $item['unit_price']*$item['counts']/100), sprintf('%.02f', $item['unit_price'] * $item['counts'] / 100),
Carbon::parse($item['order_at'])->format('Y-m-d'), Carbon::parse($item['order_at'])->format('Y-m-d'),
]; ];
@ -125,12 +125,24 @@ class OrderExport extends AbstractExport implements FromQuery, WithHeadings, Wit
*/ */
public function columnFormats(): array public function columnFormats(): array
{ {
return [ $formats = [];
if ($this->conditions['type'] == 0) {
$formats = [
'E' => NumberFormat::FORMAT_NUMBER_00, 'E' => NumberFormat::FORMAT_NUMBER_00,
'H' => NumberFormat::FORMAT_NUMBER, 'H' => NumberFormat::FORMAT_NUMBER,
'I' => NumberFormat::FORMAT_NUMBER, 'I' => NumberFormat::FORMAT_NUMBER,
'J' => NumberFormat::FORMAT_NUMBER, 'J' => NumberFormat::FORMAT_NUMBER,
'L' => NumberFormat::FORMAT_NUMBER_00, 'L' => NumberFormat::FORMAT_NUMBER_00,
]; ];
} else {
$formats = [
'E' => NumberFormat::FORMAT_NUMBER_00,
'H' => NumberFormat::FORMAT_NUMBER,
'L' => NumberFormat::FORMAT_NUMBER_00,
];
}
return $formats;
} }
} }