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
fb554a9b
Commit
fb554a9b
authored
Aug 30, 2018
by
zhuwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
1a74f28b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
PerformanceService.php
application/api_broker/service/PerformanceService.php
+3
-1
No files found.
application/api_broker/service/PerformanceService.php
View file @
fb554a9b
...
@@ -704,6 +704,7 @@ class PerformanceService
...
@@ -704,6 +704,7 @@ class PerformanceService
$addMarchInListTotal
=
$this
->
marchInModel
->
getAddMarchInListPcInfoTotal
(
$params
,
$field
);
$addMarchInListTotal
=
$this
->
marchInModel
->
getAddMarchInListPcInfoTotal
(
$params
,
$field
);
//获取图片信息
//获取图片信息
foreach
(
$addMarchInList
as
$key
=>
$val
)
{
foreach
(
$addMarchInList
as
$key
=>
$val
)
{
$addMarchInList
[
$key
][
"user_name"
]
=
$val
[
"user_name"
]
?
$val
[
"user_name"
]
:
''
;
$addMarchInList
[
$key
][
"user_phone"
]
=
preg_replace
(
'/(\d{3})\d{4}(\d{4})/'
,
'$1****$2'
,
$val
[
"user_phone"
]);
$addMarchInList
[
$key
][
"user_phone"
]
=
preg_replace
(
'/(\d{3})\d{4}(\d{4})/'
,
'$1****$2'
,
$val
[
"user_phone"
]);
}
}
return
[
"code"
=>
200
,
"date"
=>
$addMarchInList
,
"total"
=>
$addMarchInListTotal
];
return
[
"code"
=>
200
,
"date"
=>
$addMarchInList
,
"total"
=>
$addMarchInListTotal
];
...
@@ -827,7 +828,7 @@ class PerformanceService
...
@@ -827,7 +828,7 @@ class PerformanceService
}
else
{
}
else
{
$params
[
"a.district_id"
]
=
$id
;
$params
[
"a.district_id"
]
=
$id
;
}
}
$params
[
'a.create_time'
]
=
array
(
'between'
,
array
(
$start_time
.
" 00:00:00"
,
$end_time
.
" 23:59:59"
)
);
//
$params['a.create_time'] = array( 'between', array( $start_time . " 00:00:00", $end_time . " 23:59:59" ) );
$field
=
"a.id,a.level,a.name,a.phone,a.create_time,b.store_name"
;
$field
=
"a.id,a.level,a.name,a.phone,a.create_time,b.store_name"
;
...
@@ -862,6 +863,7 @@ class PerformanceService
...
@@ -862,6 +863,7 @@ class PerformanceService
$m_bargain
=
new
OBargainModel
();
$m_bargain
=
new
OBargainModel
();
$list
=
$m_bargain
->
getBargainSumList
(
$field
,
$params
,
$page_size
,
$page_no
);
$list
=
$m_bargain
->
getBargainSumList
(
$field
,
$params
,
$page_size
,
$page_no
);
foreach
(
$list
as
$key
=>
$val
)
{
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"
]);
$list
[
$key
][
"user_phone"
]
=
preg_replace
(
'/(\d{3})\d{4}(\d{4})/'
,
'$1****$2'
,
$val
[
"user_phone"
]);
}
}
return
[
"code"
=>
200
,
"date"
=>
$list
];
return
[
"code"
=>
200
,
"date"
=>
$list
];
...
...
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