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
b61a0373
Commit
b61a0373
authored
Oct 10, 2019
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
15a450ff
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
Coupon.php
application/index/controller/Coupon.php
+7
-4
No files found.
application/index/controller/Coupon.php
View file @
b61a0373
...
@@ -19,6 +19,7 @@ class Coupon extends Basic
...
@@ -19,6 +19,7 @@ class Coupon extends Basic
{
{
private
$m_coupon
;
private
$m_coupon
;
private
$m_activity
;
private
$m_activity
;
public
function
__construct
(
Request
$request
=
null
)
public
function
__construct
(
Request
$request
=
null
)
{
{
parent
::
__construct
(
$request
);
parent
::
__construct
(
$request
);
...
@@ -26,7 +27,8 @@ class Coupon extends Basic
...
@@ -26,7 +27,8 @@ class Coupon extends Basic
$this
->
m_activity
=
new
CActivity
();
$this
->
m_activity
=
new
CActivity
();
}
}
public
function
couponList
()
{
public
function
couponList
()
{
if
(
!
$this
->
request
->
isAjax
())
{
if
(
!
$this
->
request
->
isAjax
())
{
return
view
(
'cashBackList'
);
return
view
(
'cashBackList'
);
}
}
...
@@ -40,11 +42,11 @@ class Coupon extends Basic
...
@@ -40,11 +42,11 @@ class Coupon extends Basic
$m_user
=
new
Users
();
$m_user
=
new
Users
();
$field_activity
=
'money,return_action'
;
$field_activity
=
'money,return_action'
;
foreach
(
$list
as
$k
=>
$v
)
{
foreach
(
$list
as
$k
=>
$v
)
{
$activity_data
=
$this
->
m_activity
->
getFind
(
$field_activity
,
[
'id'
=>
$v
[
'activity_id'
]]);
$activity_data
=
$this
->
m_activity
->
getFind
(
$field_activity
,
[
'id'
=>
$v
[
'activity_id'
]]);
$list
[
$k
][
'money'
]
=
$activity_data
[
'money'
];
$list
[
$k
][
'money'
]
=
$activity_data
[
'money'
];
$list
[
$k
][
'return_action'
]
=
$activity_data
[
'return_action'
];
$list
[
$k
][
'return_action'
]
=
$activity_data
[
'return_action'
];
$list
[
$k
][
'user_id'
]
=
$v
[
'user_id'
];
$list
[
$k
][
'user_id'
]
=
$v
[
'user_id'
];
$list
[
$k
][
'user_phone'
]
=
$m_user
->
getUserByWhereValue
(
'user_phone'
,
[
'id'
=>
$v
[
'user_id'
]]);
$list
[
$k
][
'user_phone'
]
=
$m_user
->
getUserByWhereValue
(
'user_phone'
,
[
'id'
=>
$v
[
'user_id'
]]);
$list
[
$k
][
'user_phone'
]
=
substr_replace
(
$list
[
$k
][
'user_phone'
],
'****'
,
3
,
4
);
$list
[
$k
][
'user_phone'
]
=
substr_replace
(
$list
[
$k
][
'user_phone'
],
'****'
,
3
,
4
);
}
}
...
@@ -57,7 +59,8 @@ class Coupon extends Basic
...
@@ -57,7 +59,8 @@ class Coupon extends Basic
* @param $params
* @param $params
* @return array
* @return array
*/
*/
protected
function
binWhere
(
$params
)
{
protected
function
binWhere
(
$params
)
{
$where
=
[];
$where
=
[];
if
(
isset
(
$params
[
'start_time'
])
&&
isset
(
$params
[
'end_time'
]))
{
if
(
isset
(
$params
[
'start_time'
])
&&
isset
(
$params
[
'end_time'
]))
{
...
...
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