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
4329c97e
Commit
4329c97e
authored
Apr 25, 2018
by
zw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
report info
parent
c7362ee2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
OrderLog.php
application/api_broker/controller/OrderLog.php
+3
-3
OReportModel.php
application/model/OReportModel.php
+3
-2
No files found.
application/api_broker/controller/OrderLog.php
View file @
4329c97e
...
@@ -258,12 +258,12 @@ class OrderLog extends Basic
...
@@ -258,12 +258,12 @@ class OrderLog extends Basic
public
function
selectReportAll
()
public
function
selectReportAll
()
{
{
$params
=
$this
->
params
;
$params
=
$this
->
params
;
/* $params = array(
"order_id" => 2,
);*/
if
(
!
isset
(
$params
[
"order_id"
]))
{
if
(
!
isset
(
$params
[
"order_id"
]))
{
return
$this
->
response
(
"101"
,
"请求参数错误"
);
return
$this
->
response
(
"101"
,
"请求参数错误"
);
}
}
/* $params = array(
"order_id" => 53670,
);*/
$data
=
$this
->
service_
->
selectListByOrderNo
(
$params
[
"order_id"
]);
$data
=
$this
->
service_
->
selectListByOrderNo
(
$params
[
"order_id"
]);
return
$this
->
response
(
"200"
,
"request success"
,
$data
);
return
$this
->
response
(
"200"
,
"request success"
,
$data
);
}
}
...
...
application/model/OReportModel.php
View file @
4329c97e
...
@@ -111,8 +111,9 @@ class OReportModel extends Model
...
@@ -111,8 +111,9 @@ class OReportModel extends Model
return
$this
->
db
return
$this
->
db
->
field
(
$filed
)
->
field
(
$filed
)
->
alias
(
"a"
)
->
alias
(
"a"
)
->
join
(
"a_store b"
,
"a.store_id=b.id"
,
"left"
)
->
join
(
"a_agents e"
,
"a.report_agent_id=e.id"
,
"left"
)
->
join
(
"a_district c"
,
"a.district_id=c.id"
,
"left"
)
->
join
(
"a_store b"
,
"e.store_id=b.id"
,
"left"
)
->
join
(
"a_district c"
,
"e.district_id=c.id"
,
"left"
)
->
where
(
$where_
)
->
where
(
$where_
)
->
select
();
->
select
();
}
}
...
...
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