diff --git a/admin/controllers/store/WareController.php b/admin/controllers/store/WareController.php index ef24d27..f8ab818 100644 --- a/admin/controllers/store/WareController.php +++ b/admin/controllers/store/WareController.php @@ -662,15 +662,13 @@ class WareController extends BaseAdminController $filename = date('YmdHi') . md5($file->getBaseName()) . mt_rand(1000, 9999) . '.' . $file->getExtension(); //保存文件 $file->saveAs($filename); + // $fullFileName = $absolute_path . $filename; $data = Excel::import($filename, [ 'setFirstRecordAsKeys' => true, 'getOnlySheet' => 'Sheet1', ]); - ds([ - $data, - @unlink($filename) - ]); + $ImportForm = new ImportForm(); $ImportForm->attributes = $post; return $ImportForm->ExportUpdateDrugPrice($data, $storeId); @@ -678,7 +676,16 @@ class WareController extends BaseAdminController } catch (\Exception $e) { // 删除文件 @unlink($filename); - return ['error' => $e->getMessage()]; + return [ + 'error' => $e->getMessage(), + 'file' => $e->getFile(), + 'line' => $e->getLine(), + 'trace' => $e->getTraceAsString() + ]; + } finally { + if (file_exists($filename)) { + unlink($filename); + } } } } \ No newline at end of file