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
130e5eae
Commit
130e5eae
authored
Sep 17, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
683b1641
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
Performance.php
application/api_broker/controller/Performance.php
+5
-1
PerformanceService.php
application/api_broker/service/PerformanceService.php
+2
-2
OBargainModel.php
application/model/OBargainModel.php
+6
-2
No files found.
application/api_broker/controller/Performance.php
View file @
130e5eae
...
...
@@ -642,8 +642,12 @@ class Performance extends Basic
$page_no
=
empty
(
$params
[
'page_no'
])
?
1
:
$params
[
'page_no'
];
$page_size
=
empty
(
$params
[
'page_size'
])
?
15
:
$params
[
'page_size'
];
//request_source_type true int 请求来源默认0:App 1:PC后台
$result
=
$this
->
service_
->
getBargainSumPcInfo
(
$params
[
"id"
],
$params
[
"type"
],
$start_day
,
$end_day
,
$page_no
,
$page_size
);
$request_source_type
=
!
empty
(
$params
[
"request_source_type"
])
?
$params
[
"request_source_type"
]
:
''
;
$result
=
$this
->
service_
->
getBargainSumPcInfo
(
$params
[
"id"
],
$params
[
"type"
],
$start_day
,
$end_day
,
$page_no
,
$page_size
,
$request_source_type
);
if
(
$result
[
"code"
]
==
101
)
{
return
$this
->
response
(
"101"
,
$result
[
"date"
]);
}
else
{
...
...
application/api_broker/service/PerformanceService.php
View file @
130e5eae
...
...
@@ -852,7 +852,7 @@ class PerformanceService
* @param $page_size
* @return array
*/
public
function
getBargainSumPcInfo
(
$id
,
$type
,
$start_time
,
$end_time
,
$page_no
,
$page_size
)
public
function
getBargainSumPcInfo
(
$id
,
$type
,
$start_time
,
$end_time
,
$page_no
,
$page_size
,
$request_source_type
)
{
$params
=
$this
->
getAgentIdPcInfo
(
$id
,
$type
,
$start_time
,
$end_time
);
...
...
@@ -861,7 +861,7 @@ class PerformanceService
$field
=
"a.id,a.create_time,a.trade_type,a.scale_fee,c.landmark,d.user_phone,d.user_name,b.id as order_id"
;
$m_bargain
=
new
OBargainModel
();
$list
=
$m_bargain
->
getBargainSumList
(
$field
,
$params
,
$page_size
,
$page_no
);
$list
=
$m_bargain
->
getBargainSumList
(
$field
,
$params
,
$page_size
,
$page_no
,
$request_source_type
);
foreach
(
$list
as
$key
=>
$val
)
{
$list
[
$key
][
"user_name"
]
=
$val
[
"user_name"
]
?
$val
[
"user_name"
]
:
''
;
$list
[
$key
][
"user_phone"
]
=
preg_replace
(
'/(\d{3})\d{4}(\d{4})/'
,
'$1****$2'
,
$val
[
"user_phone"
]);
...
...
application/model/OBargainModel.php
View file @
130e5eae
...
...
@@ -1435,7 +1435,7 @@ class OBargainModel extends Model
public
function
getBargainSumList
(
$field
,
$params
,
$page_size
,
$page_no
)
public
function
getBargainSumList
(
$field
,
$params
,
$page_size
,
$page_no
,
$request_source_type
)
{
$where_
=
[];
...
...
@@ -1447,7 +1447,11 @@ class OBargainModel extends Model
$where_
[
"a.create_time"
]
=
$params
[
"create_time"
];
}
$where_
[
"a.status"
]
=
array
(
"in"
,
"10,11,13,20"
);
//$where_["a.role"] = 3;//必须是反签方
if
(
$request_source_type
&&
$request_source_type
==
1
){
//pc后台业绩 成交单数 需要调用
$where_
[
"a.role"
]
=
3
;
//必须是反签方
}
$result
=
$this
->
db_
->
field
(
$field
)
->
alias
(
"a"
)
...
...
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