From 1b276b10872d24c3a066a1f153dd461f0f757940 Mon Sep 17 00:00:00 2001
From: lq <workerqi@163.com>
Date: Thu, 31 Oct 2024 16:11:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=82=E5=B8=B8=E6=8D=95?=
 =?UTF-8?q?=E8=8E=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/controllers/drug/DrugController.php  | 56 ++++++++++++----------
 admin/controllers/store/WareController.php |  5 +-
 2 files changed, 36 insertions(+), 25 deletions(-)

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 {