From c0c5f3e36e02b1b8375b9cf68ba89b982cc0aa24 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 18 Apr 2022 11:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=98=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/base/Discount.php   | 4 ++--
 app/data/service/UserUpgradeService.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/data/controller/base/Discount.php b/app/data/controller/base/Discount.php
index 7878cecbf..6ce742207 100644
--- a/app/data/controller/base/Discount.php
+++ b/app/data/controller/base/Discount.php
@@ -64,9 +64,9 @@ class Discount extends Controller
             }
             $vo['items'] = json_encode($rule, JSON_UNESCAPED_UNICODE);
         } else {
-            $this->levels = UserUpgradeService::instance()->levels();
+            $this->levels = UserUpgradeService::levels();
             if (empty($this->levels)) $this->error('未配置用户等级！');
-            if (!empty($vo['items'])) foreach (json_decode($vo['items'], true) as $item) {
+            foreach ($vo['items'] ?? [] as $item) {
                 $vo["_level_{$item['level']}"] = $item['discount'];
             }
         }
diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php
index ad322613f..d9c829f6b 100644
--- a/app/data/service/UserUpgradeService.php
+++ b/app/data/service/UserUpgradeService.php
@@ -21,7 +21,7 @@ class UserUpgradeService extends Service
      * 获取用户等级数据
      * @return array
      */
-    public function levels(): array
+    public static function levels(): array
     {
         $model = BaseUserUpgrade::mk()->where(['status' => 1]);
         return $model->order('number asc')->column('*', 'number');