From 50dd13542e82254a65447052bc39fd80b89021fb Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 27 Jul 2024 10:12:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(OrderEnum):=20=E6=B7=BB=E5=8A=A0=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/enum/OrderEnum.php               | 4 ++++
 app/common/model/store_order/StoreOrder.php | 6 +-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/common/enum/OrderEnum.php b/app/common/enum/OrderEnum.php
index 6674b96ad..8ffae83e1 100644
--- a/app/common/enum/OrderEnum.php
+++ b/app/common/enum/OrderEnum.php
@@ -180,6 +180,10 @@ 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 81d0cb40b..90b1efcc6 100644
--- a/app/common/model/store_order/StoreOrder.php
+++ b/app/common/model/store_order/StoreOrder.php
@@ -40,12 +40,8 @@ class StoreOrder extends BaseModel
 
     public function getStatusNameTextAttr($value, $data)
     {
-        if($data['status']==-1){
-            $status = OrderEnum::refundStatus($data['refund_status']) ?? '';
-        }else{
-            $status = OrderEnum::getOrderType($data['status']) ?? '';
 
-        }
+        $status = OrderEnum::getOrderType($data['status']) ?? '';
         return $status;
     }