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
4a956e93
Commit
4a956e93
authored
Dec 24, 2018
by
zw
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test' into 1224-v3.0.3
parents
d200ed19
f6a098f4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
OrderLog.php
application/api_broker/controller/OrderLog.php
+1
-1
RankingListService.php
application/index/service/RankingListService.php
+2
-2
No files found.
application/api_broker/controller/OrderLog.php
View file @
4a956e93
...
@@ -496,7 +496,7 @@ class OrderLog extends Basic
...
@@ -496,7 +496,7 @@ class OrderLog extends Basic
if
(
!
isset
(
$params
[
"order_id"
]))
{
if
(
!
isset
(
$params
[
"order_id"
]))
{
return
$this
->
response
(
"101"
,
"请求参数错误"
);
return
$this
->
response
(
"101"
,
"请求参数错误"
);
}
}
$data
=
$this
->
service_
->
selectListByOrderNo
V2
(
$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/index/service/RankingListService.php
View file @
4a956e93
...
@@ -40,8 +40,8 @@ class RankingListService
...
@@ -40,8 +40,8 @@ class RankingListService
"10002"
=>
5
"10002"
=>
5
);
);
$this
->
weekNumMax
=
array
(
$this
->
weekNumMax
=
array
(
"10001"
=>
7
,
"10001"
=>
6
,
"10002"
=>
7
"10002"
=>
6
);
);
}
}
...
...
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