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
254cfae4
Commit
254cfae4
authored
Jun 06, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
322d3bb5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
OfficeOrderLogService.php
application/api_broker/service/OfficeOrderLogService.php
+3
-2
OfficeOBargainModel.php
application/model/OfficeOBargainModel.php
+1
-1
No files found.
application/api_broker/service/OfficeOrderLogService.php
View file @
254cfae4
...
@@ -1368,8 +1368,9 @@ class OfficeOrderLogService
...
@@ -1368,8 +1368,9 @@ class OfficeOrderLogService
$params
[
"order_id"
]
=
$order_id
;
$params
[
"order_id"
]
=
$order_id
;
$bargainModel
=
new
OfficeOBargainModel
();
$bargainModel
=
new
OfficeOBargainModel
();
$filed
=
"a.id,a.father_id,a.price,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,b.user_name,b.user_id,c.id as order_id,
$filed
=
"a.id,a.father_id,a.price,a.house_number,a.commission,a.agent_id,a.create_time,b.user_phone,
d.id as house_id,d.internal_title,d.internal_address,c.order_no,a.report_id"
;
b.user_name,b.user_id,c.id as order_id, d.id as house_id,e.title internal_title,CONCAT(e.address,d.room_number) internal_address,
c.order_no,a.report_id"
;
$result
=
$bargainModel
->
selectBargainList
(
$filed
,
$params
,
1
,
15
);
$result
=
$bargainModel
->
selectBargainList
(
$filed
,
$params
,
1
,
15
);
$list
=
[];
$list
=
[];
foreach
(
$result
as
$k
=>
$v
)
{
foreach
(
$result
as
$k
=>
$v
)
{
...
...
application/model/OfficeOBargainModel.php
View file @
254cfae4
...
@@ -296,7 +296,7 @@ class OfficeOBargainModel extends Model
...
@@ -296,7 +296,7 @@ class OfficeOBargainModel extends Model
->
limit
(
$pageSize
)
->
limit
(
$pageSize
)
->
page
(
$pageNo
)
->
page
(
$pageNo
)
->
select
();
->
select
();
// big_log($this->db_->getLastSql()
);
//echo $this->db_->getLastSql(
);
return
$result
;
return
$result
;
}
}
...
...
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