Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_group_20200303

app/Http/Controllers/OrderController.php

@@ -96,6 +96,8 @@ function getInvoiceStatus($order_id)
 // 发票抬头 -> 公司
 // 发票抬头 -> 公司
 function getCompanyName($order_id, $user_id) 
 function getCompanyName($order_id, $user_id) 
 {
 {
+    if (!$user_id) return false;
+
     $order_invoice = DB::connection('order')->table('lie_order_invoice')->where(['order_id'=>$order_id])->select('tax_title', 'inv_type')->first();
     $order_invoice = DB::connection('order')->table('lie_order_invoice')->where(['order_id'=>$order_id])->select('tax_title', 'inv_type')->first();
 
 
     if ($order_invoice && $order_invoice->inv_type != 1) return $order_invoice->tax_title;
     if ($order_invoice && $order_invoice->inv_type != 1) return $order_invoice->tax_title;

app/Model/OrderModel.php

@@ -334,6 +334,7 @@ class OrderModel extends Model
             '0' => '自采',
             '0' => '自采',
             '1' => '自采',
             '1' => '自采',
             '2' => '立创',
             '2' => '立创',
+            '3' => '京北',
         );
         );
 
 
         $tmp = array();
         $tmp = array();