Merge branch 'zjl_com_name_20210706' into development

app/Http/Controllers/OrderController.php

@@ -109,11 +109,13 @@ function getCompanyName($order_id, $user_id)
 
 
     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;
 
 
-    $company = DB::connection('order')->table('lie_user_company')->where(['user_id' => $user_id])->select('com_name')->first();
+    return false;
+
+    // $company = DB::connection('order')->table('lie_user_company')->where(['user_id' => $user_id])->select('com_name')->first();
 
 
-    if (!$company) return false;
+    // if (!$company) return false;
 
 
-    return $company->com_name;
+    // return $company->com_name;
 }
 }
 
 
 // 获取操作人名称
 // 获取操作人名称

resources/views/detail/content.blade.php

@@ -40,8 +40,8 @@
                 // 公司名称
                 // 公司名称
                 if (isset($order_invoice_info['tax_title']) && $order_invoice_info['tax_title'])
                 if (isset($order_invoice_info['tax_title']) && $order_invoice_info['tax_title'])
                     $contract_com_name = $order_invoice_info['tax_title'];
                     $contract_com_name = $order_invoice_info['tax_title'];
-                else if (isset($company_info['com_name']) && $company_info['com_name'])
-                    $contract_com_name = $company_info['com_name'];
+                // else if (isset($company_info['com_name']) && $company_info['com_name'])  /* 取消个人公司信息 20210706 */ 
+                //     $contract_com_name = $company_info['com_name'];
                 else
                 else
                     if (isset($user_info)) 
                     if (isset($user_info)) 
                         $contract_com_name = isset($user_info['mobile']) ? $user_info['mobile'] : $user_info['email'];
                         $contract_com_name = isset($user_info['mobile']) ? $user_info['mobile'] : $user_info['email'];
@@ -51,8 +51,8 @@
                 // 公司地址
                 // 公司地址
                 if (isset($order_invoice_info['company_address']) && $order_invoice_info['company_address'])
                 if (isset($order_invoice_info['company_address']) && $order_invoice_info['company_address'])
                     $contract_com_addr = $order_invoice_info['company_address'];
                     $contract_com_addr = $order_invoice_info['company_address'];
-                else if (isset($company_info['com_address']) && $company_info['com_address'])
-                    $contract_com_addr = $company_info['com_address'];
+                // else if (isset($company_info['com_address']) && $company_info['com_address'])
+                //     $contract_com_addr = $company_info['com_address'];
                 else 
                 else 
                     $contract_com_addr = $order_address_info['province_val'].$order_address_info['city_val'].$order_address_info['district_val'].$order_address_info['address'];
                     $contract_com_addr = $order_address_info['province_val'].$order_address_info['city_val'].$order_address_info['district_val'].$order_address_info['address'];