From 145e1e6e8f53445ce5cbf62b5f17bdb250442147 Mon Sep 17 00:00:00 2001
From: v-Brocloni <v-brocloni@blackfish.cn>
Date: Thu, 23 Sep 2021 17:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/unishop/Order.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/admin/controller/unishop/Order.php b/application/admin/controller/unishop/Order.php
index b3e5254..67b14fb 100644
--- a/application/admin/controller/unishop/Order.php
+++ b/application/admin/controller/unishop/Order.php
@@ -536,12 +536,13 @@ class Order extends Backend
                     FROM_UNIXTIME(o.createtime,\'%Y-%m-%d %H:%i:%S\'),
                     if(o.is_carry=1,\'已提货\',\'未提货\'),
                     refund_fee,
+                    if(o.status=1,\'正常\',\'退款\'),
                     o.remark')
             ->group("unishop_order_product.id")
             ->order("o.createtime","desc")
             ->select();
         $list = collection($list)->toArray();
-        $title = ['订单号','工号','姓名','楼层','邮箱','商品','购买数量','总金额','下单时间','是否提货','退款金额','备注'];
+        $title = ['订单号','工号','姓名','楼层','邮箱','商品','购买数量','总金额','下单时间','是否提货','退款金额','状态','备注'];
         // Create new Spreadsheet object
         $spreadsheet = new \PhpOffice\PhpSpreadsheet\Spreadsheet();
         $sheet = $spreadsheet->getActiveSheet();