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();