调整导出关联

app/Model/OrderModel.php

@@ -29,14 +29,14 @@ class OrderModel extends Model
         $list = $this->from('lie_order as o')
         $list = $this->from('lie_order as o')
                 ->join('lie_order_items as it', 'o.order_id', '=', 'it.order_id')
                 ->join('lie_order_items as it', 'o.order_id', '=', 'it.order_id')
                 ->leftJoin('lie_order_invoice as i', 'o.order_id', '=', 'i.order_id')
                 ->leftJoin('lie_order_invoice as i', 'o.order_id', '=', 'i.order_id')
-                ->join('lie_order_extend as oe', 'o.order_id', '=', 'oe.order_id')
+                ->leftJoin('lie_order_extend as oe', 'o.order_id', '=', 'oe.order_id')
                 // ->leftJoin('lie_order_address as a', function($join) {
                 // ->leftJoin('lie_order_address as a', function($join) {
                 //     $join->on('o.order_id', '=', 'a.order_id')->where('a.address_type', '=', 1);
                 //     $join->on('o.order_id', '=', 'a.order_id')->where('a.address_type', '=', 1);
                 // })
                 // })
                 // ->leftJoin('lie_order_shipping as s', function($join) {
                 // ->leftJoin('lie_order_shipping as s', function($join) {
                 //     $join->on('o.order_id', '=', 's.order_id')->where('s.shipping_type', '=', 1);
                 //     $join->on('o.order_id', '=', 's.order_id')->where('s.shipping_type', '=', 1);
                 // })
                 // })
-                ->join('lie_user_main as u', 'o.user_id', '=', 'u.user_id')
+                ->leftJoin('lie_user_main as u', 'o.user_id', '=', 'u.user_id')
                 // ->leftJoin('lie_user_company as c', 'o.user_id', '=', 'c.user_id')
                 // ->leftJoin('lie_user_company as c', 'o.user_id', '=', 'c.user_id')
                 ->where(function ($query) use ($map) {
                 ->where(function ($query) use ($map) {
                     // 查询类型
                     // 查询类型
@@ -407,7 +407,7 @@ class OrderModel extends Model
 
 
             $tmp[$i]['order_type']      = !empty($order[$i]['order_pay_type']) ? Config('params.order_pay_type')[$order[$i]['order_pay_type']] : '未知';
             $tmp[$i]['order_type']      = !empty($order[$i]['order_pay_type']) ? Config('params.order_pay_type')[$order[$i]['order_pay_type']] : '未知';
             $tmp[$i]['order_status']    = !empty($order[$i]['status']) ? Config('params.order_status')[$order[$i]['status']] : '未知';
             $tmp[$i]['order_status']    = !empty($order[$i]['status']) ? Config('params.order_status')[$order[$i]['status']] : '未知';
-            $tmp[$i]['shipping_status'] = isset($current_order_shipping['status']) ? $shipping_status[$current_order_shipping['status']] : '无发货信息'; // 发货状态
+            $tmp[$i]['shipping_status'] = !empty($current_order_shipping['status']) ? $shipping_status[$current_order_shipping['status']] : '无发货信息'; // 发货状态
 
 
             //查询发货地址的省市区
             //查询发货地址的省市区
             if ($current_order_addr) {
             if ($current_order_addr) {