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
8292a9a8
Commit
8292a9a8
authored
Jun 20, 2018
by
clone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wx0604' of
https://gitee.com/zwyjjc/tl_estate
into wx0604
parents
e58ff790
4624d246
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
RegisterService.php
application/api/service/RegisterService.php
+7
-1
PushMessageService.php
application/api_broker/service/PushMessageService.php
+5
-2
commission.js
public/resource/js/commission.js
+0
-0
tax.js
public/resource/js/tax.js
+0
-0
No files found.
application/api/service/RegisterService.php
View file @
8292a9a8
...
...
@@ -3,6 +3,7 @@
namespace
app\api\service
;
use
app\api\untils\JwtUntils
;
use
app\api_broker\service\PushMessageService
;
use
app\model\Users
;
use
app\model\UWxInfo
;
...
...
@@ -141,8 +142,13 @@ class RegisterService
$userParams
[
"id"
]
=
$id
;
}
else
{
$userParams
[
"registration_time"
]
=
date
(
"Y-m-d H:i:s"
,
time
());
if
(
$referrer_id
==
0
)
if
(
$referrer_id
==
0
)
{
$userParams
[
"first_login_time"
]
=
date
(
"Y-m-d H:i:s"
,
time
());
//记录第一次登录时间排除邀请注册
$push
=
new
PushMessageService
();
$content
=
'你邀请的客户'
.
$user_nick
.
'-'
.
$phone
.
'手机号成功下载登录App'
;
$push
->
pushMessageById
(
$referrer_id
,
'邀请注册'
,
$content
);
}
}
$userParams
[
"buyer_id"
]
=
$buyer_id
;
$userParams
[
"user_phone"
]
=
$phone
;
...
...
application/api_broker/service/PushMessageService.php
View file @
8292a9a8
...
...
@@ -166,10 +166,13 @@ class PushMessageService
if
(
empty
(
$id
))
{
return
false
;
}
$result
=
[];
$agent
=
new
AAgents
();
$device_id
=
$agent
->
getAgentsById
(
$id
,
'device_id'
);
$result
=
$this
->
push
->
public_push_message_for_one
(
$id
,
$device_id
,
$title
,
$content
,
$type
,
$user_id
);
if
(
!
empty
(
$device_id
))
{
$result
=
$this
->
push
->
public_push_message_for_one
(
$id
,
$device_id
,
$title
,
$content
,
$type
,
$user_id
);
}
return
$result
;
}
...
...
public/resource/js/commission.js
View file @
8292a9a8
This diff is collapsed.
Click to expand it.
public/resource/js/tax.js
View file @
8292a9a8
This diff is collapsed.
Click to expand it.
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