From 143e5355294d2d22d82e65390d4a282012cc8955 Mon Sep 17 00:00:00 2001
From: elonfun <496751820@qq.com>
Date: Fri, 11 Feb 2022 10:22:42 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=9C=AA=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E8=AE=A2=E5=8D=95=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/shop/Order.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/data/controller/shop/Order.php b/app/data/controller/shop/Order.php
index 692646f21..bfde2aa72 100644
--- a/app/data/controller/shop/Order.php
+++ b/app/data/controller/shop/Order.php
@@ -89,7 +89,11 @@ class Order extends Controller
         UserAdminService::instance()->buildByUid($data);
         UserAdminService::instance()->buildByUid($data, 'puid1', 'from');
         OrderService::instance()->buildData($data);
-        foreach ($data as &$vo) $vo['payment_name'] = PaymentService::name($vo['payment_type']);
+        foreach ($data as &$vo){
+            if (!is_null($vo['payment_type']) and ''!=$vo['payment_type']) {
+                $vo['payment_name'] = PaymentService::name($vo['payment_type']);
+            }
+        }
     }
 
     /**