From d51f536cd647c7d242ab417cdcb745bcd196298a Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 21 Jun 2024 12:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/store/lists/store_order/StoreOrderLists.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/store/lists/store_order/StoreOrderLists.php b/app/store/lists/store_order/StoreOrderLists.php
index 3c86ba98..3a3e8dcf 100644
--- a/app/store/lists/store_order/StoreOrderLists.php
+++ b/app/store/lists/store_order/StoreOrderLists.php
@@ -54,12 +54,15 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
         }elseif($is_sashier==2){//小程序订单
             $this->searchWhere[] = ['pay_type','in',[7,3,18]];
         }
-        return StoreOrder::where($this->searchWhere)
+       return StoreOrder::where($this->searchWhere)
             ->field(['id', 'order_id', 'pay_price', 'pay_time', 'pay_type', 'status','paid'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function ($item) use ($store_id) {
-                $item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : '';
+                if(empty($item['pay_time'])){
+                    $item['pay_time'] = '';
+                }
+//                $item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : '';
                 $item['pay_type_name'] =PayEnum::getPaySceneDesc($item['pay_type']) ?? '';
                 $item['status_name'] = OrderEnum::getOrderType($item['status']) ?? '';
                 if ($item['paid'] == 0) {
@@ -75,8 +78,6 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
                     $item['product_info'] = [];
                 }
 
-
-
                 return $item;
             })
             ->toArray();