From be6cf0aa3f343e2d6e71be2da84aa4f10bd9e0ce Mon Sep 17 00:00:00 2001
From: lewis <604446095@qq.com>
Date: Mon, 23 Dec 2024 17:42:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/LocalController.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/admin/controller/LocalController.php b/app/admin/controller/LocalController.php
index 6a592345d..bcb506ab0 100644
--- a/app/admin/controller/LocalController.php
+++ b/app/admin/controller/LocalController.php
@@ -19,11 +19,10 @@ class LocalController extends BaseAdminController
         $spreadsheet = $reader->load($file->getRealPath());
         $data = $spreadsheet->getActiveSheet()->toArray();
         $updateCount = 0;
-        $finishCount = Redis::get('finishCount');
+        $finishCount = Redis::get('updateFinishCount');
         $finishCount = empty($finishCount) ? 0 : $finishCount;
         if ($finishCount >= count($data)) {
-            echo '数据已更新完成';
-            return;
+            return $this->success('数据已更新完成');
         }
         $max = $finishCount + 100;
         foreach ($data as $k => $row) {
@@ -42,15 +41,15 @@ class LocalController extends BaseAdminController
                 $updateCount++;
             }
         }
-        Redis::set('finishCount', 100 + $finishCount);
-        echo '更新成功：' . $updateCount . '条';
+        Redis::set('updateFinishCount', 100 + $finishCount);
+        return $this->success('更新成功：' . $updateCount . '条');
     }
 
     public function updateProduct($product, $row)
     {
-        $topCateName = rtrim($row[1], '类');
-        $secondCateName = rtrim($row[2], '类');
-        $cateName = rtrim($row[3], '类');
+        $topCateName = $row[1];
+        $secondCateName = $row[2];
+        $cateName = $row[3];
         $topCate = StoreCategory::where('name', $topCateName)->value('id');
         $updateData = [];
         if (!empty($topCate) && $topCate != $product['top_cate_id']) {