From 22c89d8dddcaeaa77dc3d52a7af239fc6fab30f3 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 27 Jul 2024 10:16:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(OrderEnum):=20=E6=A0=B9=E6=8D=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E5=92=8C=E9=80=80=E6=AC=BE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/store_order/StoreOrderLists.php | 6 +++++-
 app/common/enum/OrderEnum.php                   | 4 ----
 app/common/model/store_order/StoreOrder.php     | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/admin/lists/store_order/StoreOrderLists.php b/app/admin/lists/store_order/StoreOrderLists.php
index 3da16980b..90dfddcc8 100644
--- a/app/admin/lists/store_order/StoreOrderLists.php
+++ b/app/admin/lists/store_order/StoreOrderLists.php
@@ -64,7 +64,11 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
             ->order(['id' => 'desc'])
             ->select()->each(function ($item) {
                 $item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : '';
-                $item['status_name'] = OrderEnum::getOrderType($item['status']) ?? '';
+                if($item['status']==-1){
+                    $item['status_name'] = OrderEnum::refundStatus($item['refund_status']) ?? '';
+                }else{
+                    $item['status_name'] = OrderEnum::getOrderType($item['status']) ?? '';
+                }
                 if ($item['uid'] <= 0) {
                     $item['nickname'] = '游客';
                 } else {
diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php
index 8ffae83e1..6674b96ad 100644
--- a/app/common/enum/OrderEnum.php
+++ b/app/common/enum/OrderEnum.php
@@ -180,10 +180,6 @@ class OrderEnum
      */
     public static function getOrderType($value = true)
     {
-        if($value==-1){
-            $status = self::refundStatus($value) ?? '';
-            return $status;
-        }
         $data = [
             self::RECEIVED_GOODS => '已完成',
             self::WAIT_EVALUATION => '待评价',
diff --git a/app/common/model/store_order/StoreOrder.php b/app/common/model/store_order/StoreOrder.php
index 90b1efcc6..69b1b301b 100644
--- a/app/common/model/store_order/StoreOrder.php
+++ b/app/common/model/store_order/StoreOrder.php
@@ -40,8 +40,11 @@ class StoreOrder extends BaseModel
 
     public function getStatusNameTextAttr($value, $data)
     {
-
-        $status = OrderEnum::getOrderType($data['status']) ?? '';
+        if($data['status']==-1){
+            $status = OrderEnum::refundStatus($data['refund_status']) ?? '';
+        }else{
+            $status = OrderEnum::getOrderType($data['status']) ?? '';
+        }
         return $status;
     }