diff --git a/admin/controllers/drug/DrugController.php b/admin/controllers/drug/DrugController.php index 24386cd..f43d4e2 100644 --- a/admin/controllers/drug/DrugController.php +++ b/admin/controllers/drug/DrugController.php @@ -446,32 +446,40 @@ class DrugController extends BaseAdminController */ public function actionExportReal() { - $request = \Yii::$app->request; + try { + $request = \Yii::$app->request; - if ($request->isPost) { - $post = \Yii::$app->request->post(); - //设置最大执行时间 - ini_set("max_execution_time", "360"); - $file = UploadedFile::getInstanceByName('file'); - if ($file->size > 5 * 1024 * 1024) { - return ['excel文件不能超过5M!']; + if ($request->isPost) { + $post = \Yii::$app->request->post(); + //设置最大执行时间 + ini_set("max_execution_time", "360"); + $file = UploadedFile::getInstanceByName('file'); + if ($file->size > 5 * 1024 * 1024) { + return ['excel文件不能超过5M!']; + } + + //文件名 + $filename = date('His') . md5($file->getBaseName()) . mt_rand(1000, 9999) . '.' . $file->getExtension(); + //保存文件 + $file->saveAs($filename); + // $fullFileName = $absolute_path . $filename; + $data = Excel::import($filename, [ + 'setFirstRecordAsKeys' => true, + 'getOnlySheet' => 'Sheet1', + ]); + + $ImportForm = new ImportForm(); + $ImportForm->attributes = $post; + return $ImportForm->ExportRealDrug($data); + } else { + throw new Exception('请求方式错误'); + } + } catch (\Exception $e) { + return ['error' => $e->getMessage()]; + } finally { + if (file_exists($filename)) { + unlink($filename); } - - //文件名 - $filename = date('His') . md5($file->getBaseName()) . mt_rand(1000, 9999) . '.' . $file->getExtension(); - //保存文件 - $file->saveAs($filename); - // $fullFileName = $absolute_path . $filename; - $data = Excel::import($filename, [ - 'setFirstRecordAsKeys' => true, - 'getOnlySheet' => 'Sheet1', - ]); - - $ImportForm = new ImportForm(); - $ImportForm->attributes = $post; - return $ImportForm->ExportRealDrug($data); - } else { - throw new Exception('请求方式错误'); } } } diff --git a/admin/controllers/store/WareController.php b/admin/controllers/store/WareController.php index f8ab818..fe9ae88 100644 --- a/admin/controllers/store/WareController.php +++ b/admin/controllers/store/WareController.php @@ -638,7 +638,10 @@ class WareController extends BaseAdminController return ['修改成功']; } - // Excel导入批量修改商品价格 + /** + * Excel导入批量修改商品价格 + * @return array|array[]|string[]|void + */ public function actionExcelUpdatePrice() { try {