From 9d8ed0f86396e8921fa998756837b774f6cbe034 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Sat, 4 Jan 2025 17:21:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=88=86=E9=A1=B5=E4=B8=ADkg?=
 =?UTF-8?q?=5Farray=5Fobject?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Caches/MaxCommentId.php                 | 34 ---------------------
 app/Http/Admin/Views/macros/flash_sale.volt | 31 -------------------
 app/Library/Mvc/View.php                    |  2 +-
 app/Models/Comment.php                      |  9 +-----
 app/Services/Logic/Refund/RefundCreate.php  |  9 ++----
 app/Services/Logic/Trade/TradeInfo.php      |  2 +-
 6 files changed, 5 insertions(+), 82 deletions(-)
 delete mode 100644 app/Caches/MaxCommentId.php
 delete mode 100644 app/Http/Admin/Views/macros/flash_sale.volt

diff --git a/app/Caches/MaxCommentId.php b/app/Caches/MaxCommentId.php
deleted file mode 100644
index 23367441..00000000
--- a/app/Caches/MaxCommentId.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\Comment as CommentModel;
-
-class MaxCommentId extends Cache
-{
-
-    protected $lifetime = 365 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'max_comment_id';
-    }
-
-    public function getContent($id = null)
-    {
-        $comment = CommentModel::findFirst(['order' => 'id DESC']);
-
-        return $comment->id ?? 0;
-    }
-
-}
diff --git a/app/Http/Admin/Views/macros/flash_sale.volt b/app/Http/Admin/Views/macros/flash_sale.volt
deleted file mode 100644
index 4a63a320..00000000
--- a/app/Http/Admin/Views/macros/flash_sale.volt
+++ /dev/null
@@ -1,31 +0,0 @@
-{%- macro item_type_info(value) %}
-    {% if value == 1 %}
-        课程
-    {% elseif value == 2 %}
-        套餐
-    {% elseif value == 3 %}
-        会员
-    {% endif %}
-{%- endmacro %}
-
-{%- macro item_full_info(item_type,item_info) %}
-    {% if item_type == 1 %}
-        {% set course = item_info.course %}
-        <p>名称：{{ course.title }}（{{ course.id }}）</p>
-        <p>类型：{{ item_type_info(item_type) }}　价格：{{ '￥%0.2f'|format(course.market_price) }}</p>
-    {% elseif item_type == 2 %}
-        {% set package = item_info.package %}
-        <p>名称：{{ package.title }}（{{ package.id }}）</p>
-        <p>类型：{{ item_type_info(item_type) }}　价格：{{ '￥%0.2f'|format(package.market_price) }}</p>
-    {% elseif item_type == 3 %}
-        {% set vip = item_info.vip %}
-        <p>期限：{{ '%d个月'|format(vip.expiry) }}（{{ vip.id }}）</p>
-        <p>类型：{{ item_type_info(item_type) }}　价格：{{ '￥%0.2f'|format(vip.price) }}</p>
-    {% endif %}
-{%- endmacro %}
-
-{%- macro schedules_info(schedules) %}
-    {% for value in schedules %}
-        <span class="layui-badge layui-bg-gray">{{ value }}点</span>
-    {% endfor %}
-{%- endmacro %}
\ No newline at end of file
diff --git a/app/Library/Mvc/View.php b/app/Library/Mvc/View.php
index cf9bde6e..d3d69647 100644
--- a/app/Library/Mvc/View.php
+++ b/app/Library/Mvc/View.php
@@ -33,7 +33,7 @@ class View extends PhView
         /**
          * 分页数据
          */
-        if (isset($var->items) && is_array($var->items)) {
+        if (isset($var->total_items)) {
             $var->items = kg_array_object($var->items);
         } elseif (is_array($var)) {
             $var = kg_array_object($var);
diff --git a/app/Models/Comment.php b/app/Models/Comment.php
index 5b67874b..e0cb209b 100644
--- a/app/Models/Comment.php
+++ b/app/Models/Comment.php
@@ -7,7 +7,6 @@
 
 namespace App\Models;
 
-use App\Caches\MaxCommentId as MaxCommentIdCache;
 use Phalcon\Mvc\Model\Behavior\SoftDelete;
 
 class Comment extends Model
@@ -167,18 +166,12 @@ class Comment extends Model
         $this->update_time = time();
     }
 
-    public function afterCreate()
-    {
-        $cache = new MaxCommentIdCache();
-
-        $cache->rebuild();
-    }
-
     public static function itemTypes()
     {
         return [
             self::ITEM_CHAPTER => '章节',
             self::ITEM_ARTICLE => '文章',
+            self::ITEM_QUESTION => '问题',
             self::ITEM_ANSWER => '回答',
         ];
     }
diff --git a/app/Services/Logic/Refund/RefundCreate.php b/app/Services/Logic/Refund/RefundCreate.php
index b8867dfc..b74f6867 100644
--- a/app/Services/Logic/Refund/RefundCreate.php
+++ b/app/Services/Logic/Refund/RefundCreate.php
@@ -23,8 +23,6 @@ class RefundCreate extends LogicService
 
     public function handle()
     {
-        $logger = $this->getLogger('refund');
-
         $post = $this->request->getPost();
 
         $order = $this->checkOrderBySn($post['order_sn']);
@@ -74,13 +72,8 @@ class RefundCreate extends LogicService
 
             $task = new TaskModel();
 
-            $itemInfo = [
-                'refund' => ['id' => $refund->id],
-            ];
-
             $task->item_id = $refund->id;
             $task->item_type = TaskModel::TYPE_REFUND;
-            $task->item_info = $itemInfo;
             $task->priority = TaskModel::PRIORITY_MIDDLE;
             $task->status = TaskModel::STATUS_PENDING;
 
@@ -96,6 +89,8 @@ class RefundCreate extends LogicService
 
             $this->db->rollback();
 
+            $logger = $this->getLogger('refund');
+
             $logger->error('Create Refund Exception ' . kg_json_encode([
                     'file' => $e->getFile(),
                     'line' => $e->getLine(),
diff --git a/app/Services/Logic/Trade/TradeInfo.php b/app/Services/Logic/Trade/TradeInfo.php
index bd06ffe4..c8d51873 100644
--- a/app/Services/Logic/Trade/TradeInfo.php
+++ b/app/Services/Logic/Trade/TradeInfo.php
@@ -26,7 +26,7 @@ class TradeInfo extends LogicService
     {
         $trade = $this->checkTradeBySn($sn);
 
-        $user = $this->getCurrentUser();
+        $user = $this->getLoginUser(true);
 
         return $this->handleTrade($trade, $user);
     }