Merge branch 'zjl_com_name_20210706'

app/Http/Controllers/OrderController.php

@@ -108,16 +108,15 @@ function getCompanyName($order_id, $user_id)
     $tax_title = DB::connection('order')->table('lie_order_invoice')->where('order_id', $order_id)->where('inv_type', '<>', 1)->value('tax_title');
     if ($tax_title) return $tax_title;
 
-    $contract_com_name = DB::connection('order')->table('lie_order_extend')->where('order_id', $order_id)->value('contract_com_name');
-    if ($contract_com_name) return $contract_com_name;
+    // $contract_com_name = DB::connection('order')->table('lie_order_extend')->where('order_id', $order_id)->value('contract_com_name');
+    // if ($contract_com_name) return $contract_com_name;
 
-    return false;
-
-    // $company = DB::connection('order')->table('lie_user_company')->where(['user_id' => $user_id])->select('com_name')->first();
+    // return false;
 
-    // if (!$company) return false;
+    $com_name = DB::connection('order')->table('lie_user_company')->where('user_id', $user_id)->value('com_name');
+    if ($com_name) return $com_name;
 
-    // return $company->com_name;
+    return false;
 }
 
 // 获取操作人名称

resources/views/detail/content.blade.php

@@ -40,8 +40,8 @@
                 // 公司名称
                 if (isset($order_invoice_info['tax_title']) && $order_invoice_info['tax_title'])
                     $contract_com_name = $order_invoice_info['tax_title'];
-                // else if (isset($company_info['com_name']) && $company_info['com_name'])  /* 取消个人公司信息 20210706 */ 
-                //     $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
                     if (isset($user_info)) 
                         $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'])
                     $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 
                     $contract_com_addr = $order_address_info['province_val'].$order_address_info['city_val'].$order_address_info['district_val'].$order_address_info['address'];