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
d187d90e
authored
Oct 25, 2021
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整乙方合同编辑
parent
dae9a55b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
6 deletions
app/Http/Controllers/OrderController.php
app/Model/OrderContractModel.php
resources/views/detail/content.blade.php
app/Http/Controllers/OrderController.php
View file @
d187d90e
...
...
@@ -18,6 +18,7 @@ use App\Model\CmsModel;
use
App\Model\QueuedModel
;
use
App\Model\OrderModel
;
use
App\Model\OrderExtendModel
;
use
App\Model\OrderContractModel
;
use
App\Model\OrderPriceModel
;
use
App\Model\OrderAddressModel
;
use
App\Model\OrderActionLogModel
;
...
...
@@ -1748,6 +1749,7 @@ Class OrderController extends Controller
'order_pay_log'
=>
$temp
[
'data'
][
'order_pay_log'
],
'order_price_info'
=>
$temp
[
'data'
][
'order_price_info'
],
'order_temp_info'
=>
$temp
[
'data'
][
'order_temp_info'
],
'order_contract_info'
=>
$temp
[
'data'
][
'order_contract_info'
],
'order_shipping_inside'
=>
$temp
[
'data'
][
'order_shipping_inside'
],
'actionLog'
=>
$actionLog
,
'erpPayLog'
=>
$erpPayLog
,
...
...
@@ -2108,7 +2110,7 @@ Class OrderController extends Controller
$data
[
'contract_link_tel'
]
=
$request
->
input
(
'contract_link_tel'
,
''
);
DB
::
connection
(
'order'
)
->
transaction
(
function
()
use
(
$request
,
$order_id
,
$data
)
{
Order
ExtendModel
::
where
(
'order_id'
,
$order_id
)
->
update
(
$data
);
Order
ContractModel
::
updateOrCreate
([
'order_id'
=>
$order_id
],
$data
);
$OrderActionLogModel
=
new
OrderActionLogModel
();
$OrderActionLogModel
->
addLog
(
$order_id
,
$request
->
user
->
userId
,
2
,
'编辑合同乙方信息'
);
// 操作记录
...
...
app/Model/OrderContractModel.php
0 → 100644
View file @
d187d90e
<?php
namespace
App\Model
;
use
Illuminate\Database\Eloquent\Model
;
use
DB
;
class
OrderContractModel
extends
Model
{
protected
$connection
=
'order'
;
protected
$table
=
'lie_order_contract'
;
protected
$primaryKey
=
'sc_id'
;
protected
$guarded
=
[
'sc_id'
];
public
$timestamps
=
false
;
}
\ No newline at end of file
resources/views/detail/content.blade.php
View file @
d187d90e
...
...
@@ -31,11 +31,11 @@
</div>
<?php
if
(
$order_
temp
_info
[
'contract_com_name'
])
{
$contract_com_name
=
$order_
temp
_info
[
'contract_com_name'
];
$contract_com_addr
=
$order_
temp
_info
[
'contract_com_addr'
];
$contract_link_name
=
$order_
temp
_info
[
'contract_link_name'
];
$contract_link_tel
=
$order_
temp
_info
[
'contract_link_tel'
];
if
(
$order_
contract
_info
[
'contract_com_name'
])
{
$contract_com_name
=
$order_
contract
_info
[
'contract_com_name'
];
$contract_com_addr
=
$order_
contract
_info
[
'contract_com_addr'
];
$contract_link_name
=
$order_
contract
_info
[
'contract_link_name'
];
$contract_link_tel
=
$order_
contract
_info
[
'contract_link_tel'
];
}
else
{
// 若未填写乙方信息,则拉取相关数据
// 公司名称
if
(
isset
(
$order_invoice_info
[
'tax_title'
])
&&
$order_invoice_info
[
'tax_title'
])
...
...
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