Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
97043ac3
Commit
97043ac3
authored
Jul 17, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
1f9a4321
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
14 deletions
+1
-14
OrderLogService.php
application/api_broker/service/OrderLogService.php
+1
-14
No files found.
application/api_broker/service/OrderLogService.php
View file @
97043ac3
...
...
@@ -565,19 +565,6 @@ class OrderLogService
a.estimated_receipt_date,a.submit_agent_name, a.price,a.commission,a.role,a.agent_id,a.scale,a.scale_fee,a.create_time,b.name,b.phone"
;
$bargainData
=
$oBargainModel
->
selectBargainListByOrderNo
(
$field_bargain
,
[
"order_id"
=>
$order_id
]);
if
(
count
(
$bargainData
)
>
0
)
{
// foreach ($bargainData as $k=>$v) {
// if ($v['father_id'] == 0) {
// $sort++;
// $result[$sort]['step_name'] = "bargain";
// $result[$sort]['trade_type'] = $v['trade_type'];
// $result[$sort]['house_number'] = $v['house_number'];
// $result[$sort]['industry_type'] = $v['industry_type'];
// $result[$sort]['price'] = $v['price'];
// $result[$sort]['commission'] = $v['commission'];
// $result[$sort]['is_open'] = $v['is_open'];
// }
// }
$bargain_data_arr
=
$this
->
arr2TreeBargain
(
$bargainData
);
foreach
(
$bargain_data_arr
as
$k2
=>
$v2
)
{
$v2
[
"step_name"
]
=
"bargain"
;
...
...
@@ -640,7 +627,7 @@ class OrderLogService
$tree
[
$v
[
"father_id"
]][
'is_open'
]
=
$v
[
'is_open'
];
}
$tree
[
$v
[
"father_id"
]][
'list'
][]
=
$v
;
$tree
[
$v
[
"father_id"
]][
'list
_array
'
][]
=
$v
;
}
return
$tree
;
...
...
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