Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
3f57ae3c
authored
Jul 13, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台修改用户密码功能
parent
d9a328bb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
179 additions
and
3 deletions
src/main/java/com/ctrip/fun/admin/controller/JsonController.java
src/main/java/com/ctrip/fun/admin/service/system/UserService.java
src/main/resources/properties/service.properties
src/main/webapp/WEB-INF/templates/system/UserInfoDetail.ftl
src/main/webapp/resource/js/app/op.js
src/main/java/com/ctrip/fun/admin/controller/JsonController.java
View file @
3f57ae3c
...
...
@@ -163,6 +163,7 @@ import com.ctrip.fun.common.vo.tour.TourBasicBean;
import
com.ctrip.fun.common.vo.tour.TourBasicQuery
;
import
com.ctrip.fun.common.vo.user.OutsideUserBean
;
import
com.ctrip.fun.common.vo.user.TransferOutsideUserAmtBean
;
import
com.ctrip.fun.common.vo.user.UserBean
;
import
com.ctrip.fun.common.vo.user.UserConractsBean
;
import
com.ctrip.fun.common.vo.user.UserConractsQuery
;
import
com.ctrip.fun.common.vo.user.UserExtBean
;
...
...
@@ -1428,7 +1429,31 @@ public class JsonController {
}
return
response
;
}
@RequestMapping
(
value
=
"/system/user/{uid}/resetMobilePhone"
,
method
=
RequestMethod
.
POST
)
@ResponseStatus
(
HttpStatus
.
OK
)
@ResponseBody
public
Response
<
UserExtBean
>
resetMobilePhone
(
HttpServletRequest
request
,
@PathVariable
String
uid
,
@RequestParam
String
mobilePhone
)
{
Response
<
UserExtBean
>
response
=
new
Response
<
UserExtBean
>();
if
(
uid
!=
null
&&
null
!=
mobilePhone
)
{
UserExtBean
requestBean
=
new
UserExtBean
();
requestBean
.
setUid
(
uid
);
requestBean
.
setMobilePhone
(
mobilePhone
);
int
flag
=
userService
.
updateMobilePhone
(
request
.
getAttribute
(
"userName"
).
toString
(),
requestBean
);
if
(
flag
==
0
)
{
response
.
setStatus
(
ResponseStatusEnum
.
SUCCESS
.
getValue
());
response
.
setMessage
(
ResponseStatusEnum
.
SUCCESS
.
getMsg
());
response
.
setBody
(
requestBean
);
}
else
{
response
.
setStatus
(
ResponseStatusEnum
.
FAIL
.
getValue
());
response
.
setMessage
(
ResponseStatusEnum
.
FAIL
.
getMsg
());
}
}
else
{
response
.
setStatus
(
ResponseStatusEnum
.
FAIL
.
getValue
());
response
.
setMessage
(
ResponseStatusEnum
.
FAIL
.
getMsg
());
}
return
response
;
}
@RequestMapping
(
value
=
"/advertisement/{pageId}"
,
method
=
RequestMethod
.
GET
)
@ResponseStatus
(
HttpStatus
.
OK
)
@ResponseBody
...
...
@@ -2397,5 +2422,25 @@ public class JsonController {
response
.
setBody
((
List
<
EventGamePlayerBean
>)
pagedList
.
getResult
());
return
response
;
}
@RequestMapping
(
value
=
"/getUserInfoByPhone"
,
method
=
RequestMethod
.
GET
)
@ResponseStatus
(
HttpStatus
.
OK
)
@ResponseBody
public
Response
<
UserExtBean
>
getUserInfoByPhone
(
HttpServletRequest
request
,
@RequestParam
(
value
=
"mobilePhone"
,
required
=
false
)
String
mobilePhone
)
{
Response
<
UserExtBean
>
response
=
new
Response
<
UserExtBean
>();
response
.
setStatus
(
ResponseStatusEnum
.
SUCCESS
.
getValue
());
response
.
setMessage
(
ResponseStatusEnum
.
SUCCESS
.
getMsg
());
UserExtQuery
userExtQuery
=
new
UserExtQuery
();
userExtQuery
.
setMobile
(
mobilePhone
);
userExtQuery
.
setSortField
(
"registerTime"
);
userExtQuery
.
setPagerOffset
(
0
);
userExtQuery
.
setPagerPerPage
(
20
);
PagedResponseBean
<
UserExtBean
>
responseUserExt
=
userService
.
list
(
""
,
userExtQuery
);
if
(
responseUserExt
.
getResult
()!=
null
&&
responseUserExt
.
getResult
().
size
()>
0
){
response
.
setBody
(((
List
<
UserExtBean
>)
responseUserExt
.
getResult
()).
get
(
0
));
}
else
{
response
.
setBody
(
null
);
}
return
response
;
}
}
src/main/java/com/ctrip/fun/admin/service/system/UserService.java
View file @
3f57ae3c
...
...
@@ -283,7 +283,35 @@ public class UserService extends BaseService {
return
1
;
}
}
/*
* 修改用户手机号接口
*/
public
int
updateMobilePhone
(
String
userId
,
UserExtBean
userExtBean
)
{
String
uri
=
super
.
getServiceUri
(
"uri.User.updateMobilePhone"
);
Request
<
UserExtBean
>
request
=
new
Request
<
UserExtBean
>();
request
.
setUserId
(
userId
);
request
.
setBody
(
userExtBean
);
HttpEntity
<
Request
<
UserExtBean
>>
httpEntity
=
new
HttpEntity
<
Request
<
UserExtBean
>>(
request
);
Response
<
Integer
>
response
=
super
.
exchange
(
uri
,
HttpMethod
.
POST
,
httpEntity
,
new
ParameterizedTypeReference
<
Response
<
Integer
>>()
{
}).
getBody
();
if
(
response
.
getStatus
()
==
ResponseStatusEnum
.
SUCCESS
.
getValue
())
{
return
0
;
}
else
{
Map
<
String
,
String
>
tags
=
new
HashMap
<>();
tags
.
put
(
"userId"
,
userId
);
tags
.
put
(
"userExtBean"
,
userExtBean
.
toString
());
logger
.
error
(
"修改用户推荐码接口updateRecode异常"
,
String
.
format
(
"status: %d, msg: %s"
,
response
.
getStatus
(),
response
.
getMessage
()),
tags
);
return
1
;
}
}
/*
* 修改用户状态接口
*/
...
...
src/main/resources/properties/service.properties
View file @
3f57ae3c
...
...
@@ -9,6 +9,7 @@ uri.User.list=/fun-golf-service/userext/list
uri.User.get
=
/fun-golf-service/userext/get
uri.User.getByUid
=
/fun-golf-service/userext/getByUid
uri.User.getUserExtByName
=
/fun-golf-service/userext/getUserExtByName
uri.User.updateMobilePhone
=
/fun-golf-service/userext/updateMobilePhone
uri.User.updateRecode
=
/fun-golf-service/userext/updateRecode
uri.User.updateBlockFlag
=
/fun-golf-service/userext/updateBlockFlag
uri.User.getOutsideUser
=
/fun-golf-service/user/getOutsideUserByUsername
...
...
src/main/webapp/WEB-INF/templates/system/UserInfoDetail.ftl
View file @
3f57ae3c
...
...
@@ -363,7 +363,15 @@ $(function() {
</tr><tr>
<td>
性别
</td><td>
${bean.gender!}
</td><td>
生日
</td><td>
${bean.birth!}
</td>
</tr><tr>
<td>
手机号
</td><td>
${bean.mobilePhone!}
<button
class=
"btn btn-default"
onclick=
"callTitle('${bean.mobilePhone!}');"
title=
"我们将会先拨通您的座机号码,再拨通对方的号码"
>
拨打
</button></td>
<td>
手机号
</td>
<td>
<div
id=
"mobilePhoneShow"
>
<label
id=
"mobilePhoneLabel"
style=
"font-size:12px; float:left"
>
${bean.mobilePhone!}
</label>
<input
type=
"hidden"
name=
"uidForMobilePhoneEdit"
value=
"${bean.uid!}"
id=
"userid"
>
<button
type=
"button"
onclick=
"changeMobilePhoneToEdit()"
>
修改
</button>
<button
onclick=
"callTitle('${bean.mobilePhone!}');"
title=
"我们将会先拨通您的座机号码,再拨通对方的号码"
>
拨打
</button>
</div>
</td>
<td>
手机号归属地
</td><td>
${bean.city!} ${bean.province!}
</td>
</tr>
<tr>
...
...
@@ -721,4 +729,48 @@ $(function() {
</div>
</div>
<div
class=
"modal hide fade"
id=
"changeMobilePhoneToEdit"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"close"
data-dismiss=
"modal"
>
×
</button>
<h3>
修改手机号
</h3>
</div>
<div
class=
"modal-body"
id=
'courseSelector'
>
<div
class=
"input-append"
>
<input
type=
"text"
name=
"mobilePhone"
value=
""
placeholder=
"新手机号"
class=
"input-medium"
autocomplete=
"off"
/>
<button
class=
"btn"
data-toggle=
"modal"
onclick=
"queryMobilePhoneInModal()"
>
手机号核实
</button>
<button
style=
"margin-left:50px;"
class=
"btn"
data-toggle=
"modal"
onclick=
"updateMobilePhone()"
>
确认修改
</button>
</div>
<table
class=
"table table-bordered table-striped"
>
<tbody
id=
"tableList"
>
</tbody>
</table>
<div
class=
"pagination pagination-mini"
>
<p
style=
"color:red;"
>
1. 新号码未注册,更改之后旧号码将无法登录
<br/>
2. 新号码已注册,更改之后将无法看到旧号码的订单,记分等信息,但新旧号码都可以登录
</p>
</div>
</div>
</div>
<script
id=
"table_course"
type=
"text/x-handlebars-template"
>
<
tr
>
<
td
>
用户名:
{{
userName
}}
<
/td> <td>性别:{{gender}}</
td
>
<
/tr>
<
tr
>
<
td
>
生日:
{{
birth
}}
<
/td> <td>手机号归属地:{{city}} {{province}}</
td
>
<
/tr>
<
tr
>
<
td
>
UID
:
<
a
href
=
"/system/user/{{uid}}/detailByUid"
>
{{
uid
}}
<
/a></
td
>
<
td
>
余额:
{{
prePayCardAmount
}}
<
/td>
<
/tr
>
<
tr
>
<
td
>
注册时间:
{{
registerTime
}}
<
/td> <td>昵称:{{umNickName}}</
td
>
<
/tr
>
<
tr
>
<
td
>
邮箱:
{{
email
}}
<
/td> <td>最后登录时间:{{lastLoginTime}}</
td
>
<
/tr>
</script>
</
@
com
.layout
>
src/main/webapp/resource/js/app/op.js
View file @
3f57ae3c
...
...
@@ -519,7 +519,57 @@
}
});
}
function
changeMobilePhoneToEdit
(){
$
(
"#changeMobilePhoneToEdit"
).
modal
(
'show'
);
}
function
queryMobilePhoneInModal
(){
var
mobilePhone
=
$
(
"#courseSelector"
).
find
(
"input[name=mobilePhone]"
).
val
();
if
(
mobilePhone
==
""
){
alert
(
"请输入新手机号"
);
return
}
$
.
ajax
({
url
:
"/j/getUserInfoByPhone"
,
type
:
"get"
,
data
:
{
mobilePhone
:
mobilePhone
},
success
:
function
(
obj
)
{
var
source
=
$
(
"#table_course"
).
html
();
var
template
=
Handlebars
.
compile
(
source
);
$
(
'#tableList'
).
html
(
template
(
obj
.
body
))
}
});
}
function
updateMobilePhone
(){
var
mobilePhone
=
$
(
"#courseSelector"
).
find
(
"input[name=mobilePhone]"
).
val
();
$
(
'#changeMobilePhoneToEdit'
).
modal
(
'hide'
);
jQuery
.
ajax
({
type
:
"POST"
,
contentType
:
"application/x-www-form-urlencoded"
,
url
:
"/j/system/user/"
+
$
(
"input[name='uidForMobilePhoneEdit']"
).
val
()
+
"/resetMobilePhone"
,
data
:{
mobilePhone
:
mobilePhone
.
trim
()
},
success
:
function
(
data
){
data
=
eval
(
data
);
if
(
data
.
status
==
0
){
alert
(
"修改成功"
);
}
else
{
alert
(
"修改失败!"
+
data
.
message
);
}
},
error
:
function
(){
alert
(
"修改失败!"
);
}
});
}
function
mbsOrderAddLog
(){
jQuery
.
ajax
({
type
:
"POST"
,
...
...
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