Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
朱继来
/
后台订单管理
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8c1c803f
authored
Jul 06, 2021
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整公司名称
parent
4e21243e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
app/Http/Controllers/OrderController.php
resources/views/detail/content.blade.php
app/Http/Controllers/OrderController.php
View file @
8c1c803f
...
...
@@ -109,11 +109,13 @@ function getCompanyName($order_id, $user_id)
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
View file @
8c1c803f
...
...
@@ -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'
])
$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'
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment