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
3a5839b3
Commit
3a5839b3
authored
Sep 11, 2018
by
clone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
da6e7ce3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
11 deletions
+21
-11
User.php
application/api_broker/controller/User.php
+2
-1
Users.php
application/model/Users.php
+19
-10
No files found.
application/api_broker/controller/User.php
View file @
3a5839b3
...
@@ -82,7 +82,8 @@ class User extends Basic
...
@@ -82,7 +82,8 @@ class User extends Basic
"pageSize" => 15,
"pageSize" => 15,
"status" => 0,
"status" => 0,
);*/
);*/
$field
=
"id as user_id,sex,user_name,city,user_phone,user_status,agent_id,create_time,industry_type,price_demand,area_demand,vip,source"
;
$field
=
"id as user_id,sex,user_name,city,user_phone,user_status,agent_id,create_time,industry_type,price_demand,
area_demand,vip,source,source_intro"
;
$conditions
=
[];
$conditions
=
[];
...
...
application/model/Users.php
View file @
3a5839b3
...
@@ -293,24 +293,32 @@ class Users extends Model
...
@@ -293,24 +293,32 @@ class Users extends Model
if
(
!
empty
(
$data
[
'user_label'
]))
{
if
(
!
empty
(
$data
[
'user_label'
]))
{
$insert_data
[
'user_label'
]
=
$data
[
'user_label'
];
$insert_data
[
'user_label'
]
=
$data
[
'user_label'
];
}
}
if
(
!
empty
(
$data
[
'industry_type'
]))
{
if
(
!
empty
(
$data
[
'industry_type'
]))
{
$insert_data
[
'industry_type'
]
=
$data
[
'industry_type'
];
$insert_data
[
'industry_type'
]
=
$data
[
'industry_type'
];
}
}
if
(
!
empty
(
$data
[
'price_demand'
]))
{
if
(
!
empty
(
$data
[
'price_demand'
]))
{
$insert_data
[
'price_demand'
]
=
$data
[
'price_demand'
];
$insert_data
[
'price_demand'
]
=
$data
[
'price_demand'
];
}
}
if
(
!
empty
(
$data
[
'area_demand'
]))
{
if
(
!
empty
(
$data
[
'area_demand'
]))
{
$insert_data
[
'area_demand'
]
=
$data
[
'area_demand'
];
$insert_data
[
'area_demand'
]
=
$data
[
'area_demand'
];
}
}
if
(
isset
(
$data
[
'vip'
]))
{
if
(
isset
(
$data
[
'vip'
]))
{
$insert_data
[
'vip'
]
=
$data
[
'vip'
];
$insert_data
[
'vip'
]
=
$data
[
'vip'
];
}
}
if
(
!
empty
(
$data
[
'source'
]))
{
if
(
!
empty
(
$data
[
'source'
]))
{
$insert_data
[
'source'
]
=
$data
[
'source'
];
$insert_data
[
'source'
]
=
$data
[
'source'
];
}
}
if
(
isset
(
$data
[
'source_intro'
]))
{
$insert_data
[
'source_intro'
]
=
$data
[
'source_intro'
];
}
//邀请人
//邀请人
if
(
!
empty
(
$data
[
'referrer_id'
])
&&
!
empty
(
$data
[
'referrer_source'
])
&&
(
$data
[
'referrer_id'
]
!=
-
1
))
{
if
(
!
empty
(
$data
[
'referrer_id'
])
&&
!
empty
(
$data
[
'referrer_source'
])
&&
(
$data
[
'referrer_id'
]
!=
-
1
))
{
$insert_data
[
'referrer_id'
]
=
$data
[
'referrer_id'
];
$insert_data
[
'referrer_id'
]
=
$data
[
'referrer_id'
];
$insert_data
[
'referrer_source'
]
=
$data
[
'referrer_source'
];
$insert_data
[
'referrer_source'
]
=
$data
[
'referrer_source'
];
}
}
if
(
$id
&&
$id
>
0
)
{
if
(
$id
&&
$id
>
0
)
{
...
@@ -318,7 +326,7 @@ class Users extends Model
...
@@ -318,7 +326,7 @@ class Users extends Model
$insert_data
[
'update_time'
]
=
date
(
'Y-m-d H:i:s'
);
$insert_data
[
'update_time'
]
=
date
(
'Y-m-d H:i:s'
);
if
(
$data
[
'referrer_id'
]
==
-
1
)
{
if
(
$data
[
'referrer_id'
]
==
-
1
)
{
$insert_data
[
'referrer_id'
]
=
0
;
$insert_data
[
'referrer_id'
]
=
0
;
$insert_data
[
'referrer_source'
]
=
0
;
$insert_data
[
'referrer_source'
]
=
0
;
}
}
...
@@ -366,8 +374,9 @@ class Users extends Model
...
@@ -366,8 +374,9 @@ class Users extends Model
public
function
getClient
(
$id
)
public
function
getClient
(
$id
)
{
{
if
(
$id
)
{
if
(
$id
)
{
$field
=
"a.id as user_id,a.user_nick,a.user_pic,a.other_pic,a.user_name,a.user_phone,a.sex,a.agent_id,a.industry_type,a.user_label,
$field
=
"a.id as user_id,a.user_nick,a.user_pic,a.other_pic,a.user_name,a.user_phone,a.sex,a.agent_id,
a.price_demand,a.area_demand,a.create_time,b.name,b.phone,a.first_login_time,a.referrer_id,a.referrer_source,a.province,a.city,a.disc,a.source"
;
a.industry_type,a.user_label,a.price_demand,a.area_demand,a.create_time,b.name,b.phone,a.first_login_time,
a.referrer_id,a.referrer_source,a.province,a.city,a.disc,a.source,a.source_intro"
;
$data
=
$this
->
field
(
$field
)
$data
=
$this
->
field
(
$field
)
->
alias
(
'a'
)
->
alias
(
'a'
)
...
@@ -389,7 +398,7 @@ class Users extends Model
...
@@ -389,7 +398,7 @@ class Users extends Model
$data
[
'referrer_user'
]
=
$referrer_user
[
'name'
]
.
'-'
.
$referrer_user
[
'phone'
];
$data
[
'referrer_user'
]
=
$referrer_user
[
'name'
]
.
'-'
.
$referrer_user
[
'phone'
];
}
elseif
(
$data
[
'referrer_source'
]
==
10
)
{
}
elseif
(
$data
[
'referrer_source'
]
==
10
)
{
$referrer_user
=
$this
->
field
(
'user_name,user_phone'
)
->
find
(
$data
[
'referrer_id'
]);
$referrer_user
=
$this
->
field
(
'user_name,user_phone'
)
->
find
(
$data
[
'referrer_id'
]);
$user_phone
=
substr_replace
(
$referrer_user
[
'user_phone'
],
'****'
,
3
,
4
);
$user_phone
=
substr_replace
(
$referrer_user
[
'user_phone'
],
'****'
,
3
,
4
);
$data
[
'referrer_user'
]
=
$referrer_user
[
'user_name'
]
.
'-'
.
$user_phone
;
$data
[
'referrer_user'
]
=
$referrer_user
[
'user_name'
]
.
'-'
.
$user_phone
;
}
}
...
@@ -443,12 +452,12 @@ class Users extends Model
...
@@ -443,12 +452,12 @@ class Users extends Model
if
(
$referrer
!=
0
)
{
if
(
$referrer
!=
0
)
{
if
(
$data
[
'referrer_source'
]
==
10
)
{
if
(
$data
[
'referrer_source'
]
==
10
)
{
$referrer_user
=
$data
[
'referrer_user'
]
=
db
(
'u_users'
)
$referrer_user
=
$data
[
'referrer_user'
]
=
db
(
'u_users'
)
->
where
(
'id'
,
$data
[
'referrer_id'
])
->
where
(
'id'
,
$data
[
'referrer_id'
])
->
field
(
'user_phone,user_name'
)
->
field
(
'user_phone,user_name'
)
->
find
();
->
find
();
$user_phone
=
empty
(
$referrer_user
[
'user_phone'
])
?
''
:
substr_replace
(
$referrer_user
[
'user_phone'
],
'****'
,
3
,
4
);
$user_phone
=
empty
(
$referrer_user
[
'user_phone'
])
?
''
:
substr_replace
(
$referrer_user
[
'user_phone'
],
'****'
,
3
,
4
);
$referrer_user_string
=
$referrer_user
[
'user_name'
]
.
'-'
.
$user_phone
;
$referrer_user_string
=
$referrer_user
[
'user_name'
]
.
'-'
.
$user_phone
;
}
else
{
}
else
{
$referrer_user
=
$data
[
'referrer_user'
]
=
db
(
'a_agents'
)
$referrer_user
=
$data
[
'referrer_user'
]
=
db
(
'a_agents'
)
...
@@ -825,7 +834,7 @@ class Users extends Model
...
@@ -825,7 +834,7 @@ class Users extends Model
}
}
public
function
getLastOrNextUserID
(
$where
,
$field
,
$limit
,
$order
,
$type
)
public
function
getLastOrNextUserID
(
$where
,
$field
,
$limit
,
$order
,
$type
)
{
{
if
(
$type
==
1
)
{
if
(
$type
==
1
)
{
...
@@ -879,8 +888,8 @@ class Users extends Model
...
@@ -879,8 +888,8 @@ class Users extends Model
public
function
getUserCityInfo
(
$id
)
public
function
getUserCityInfo
(
$id
)
{
{
$field
=
'province,city,disc,create_time'
;
$field
=
'province,city,disc,create_time'
;
$params
=
[
'id'
=>
$id
];
$params
=
[
'id'
=>
$id
];
$result
=
Db
::
table
(
$this
->
table
)
$result
=
Db
::
table
(
$this
->
table
)
->
field
(
$field
)
->
field
(
$field
)
->
where
(
$params
)
->
where
(
$params
)
...
...
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