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
a3f95ac6
Commit
a3f95ac6
authored
Jun 20, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
52da837e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
Performance.php
application/api_broker/controller/Performance.php
+8
-8
OBargainModel.php
application/model/OBargainModel.php
+2
-2
No files found.
application/api_broker/controller/Performance.php
View file @
a3f95ac6
...
@@ -396,14 +396,14 @@ class Performance extends Basic
...
@@ -396,14 +396,14 @@ class Performance extends Basic
public
function
superviseList
()
public
function
superviseList
()
{
{
header
(
'Access-Control-Allow-Origin:*'
);
header
(
'Access-Control-Allow-Origin:*'
);
/*
$params = $this->params;
$params
=
$this
->
params
;
$params = array(
/*
$params = array(
"agent_id" => 78,
"agent_id" => 78,
"start_time" => "2018-06-12",
"start_time" => "2018-06-12",
"end_time" => "2018-06-20",
"end_time" => "2018-06-20",
"page_no" => 1,
"page_no" => 1,
"page_size" => 15
"page_size" => 15
);*/
);*/
$checkResult
=
$this
->
validate
(
$params
,
"PerformanceValidate.verifyOther"
);
$checkResult
=
$this
->
validate
(
$params
,
"PerformanceValidate.verifyOther"
);
if
(
true
!==
$checkResult
)
{
if
(
true
!==
$checkResult
)
{
...
...
application/model/OBargainModel.php
View file @
a3f95ac6
...
@@ -556,7 +556,7 @@ class OBargainModel extends Model
...
@@ -556,7 +556,7 @@ class OBargainModel extends Model
public
function
getReceivedGroupTime
(
$params
)
public
function
getReceivedGroupTime
(
$params
)
{
{
$where_
=
[];
$where_
=
[];
$field
=
"sum(b.
money
) as num,DATE(b.create_time) as day"
;
$field
=
"sum(b.
practical_fee
) as num,DATE(b.create_time) as day"
;
if
(
isset
(
$params
[
"agent_id"
]))
{
if
(
isset
(
$params
[
"agent_id"
]))
{
...
@@ -646,7 +646,7 @@ class OBargainModel extends Model
...
@@ -646,7 +646,7 @@ class OBargainModel extends Model
public
function
getReceived
(
$params
)
public
function
getReceived
(
$params
)
{
{
$where_
=
[];
$where_
=
[];
$field
=
"sum(b.
money
) as num"
;
$field
=
"sum(b.
practical_fee
) as num"
;
if
(
isset
(
$params
[
"agent_id"
]))
{
if
(
isset
(
$params
[
"agent_id"
]))
{
...
...
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