From 6d19f390e1b58845a4d136c271bb68d0d4627c0b Mon Sep 17 00:00:00 2001
From: v-Brocloni <v-brocloni@blackfish.cn>
Date: Thu, 23 Sep 2021 17:49:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/admin/controller/unishop/Order.php b/application/admin/controller/unishop/Order.php
index 237899c..0385b0c 100644
--- a/application/admin/controller/unishop/Order.php
+++ b/application/admin/controller/unishop/Order.php
@@ -522,7 +522,7 @@ class Order extends Backend
             ->join('user', 'user.id = o.user_id')
             ->join('unishop_order_product', 'unishop_order_product.order_id = o.id')
             ->where([
-                'o.status'=>1
+                'o.status'=>["!=",0]
             ])
             ->field('
             out_trade_no,
@@ -535,12 +535,13 @@ class Order extends Backend
                     unishop_order_product.price,
                     FROM_UNIXTIME(o.createtime,\'%Y-%m-%d %H:%i:%S\'),
                     if(o.is_carry=1,\'已提货\',\'未提货\'),
+                    refund_fee,
                     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();