Commit 9b86a35c authored by liuyang's avatar liuyang

update

parent f993e967
...@@ -106,7 +106,10 @@ public class MdpController { ...@@ -106,7 +106,10 @@ public class MdpController {
//老用户 //老用户
if (!user.getName().equals(vo.getName())){ if (!user.getName().equals(vo.getName())){
result.put("errorMsg","姓名与库中信息不符,请核实后重新提交"); result.put("errorMsg","姓名与库中信息不符,请核实后重新提交");
}else if(!Strings.isNullOrEmpty(user.getOpenid())){
result.put("errorMsg","该用户已与其他微信绑定");
}else { }else {
user.setOpenid(vo.getOpenid()); user.setOpenid(vo.getOpenid());
if (!Strings.isNullOrEmpty(vo.getPhone())){ if (!Strings.isNullOrEmpty(vo.getPhone())){
//更新微信绑定的手机号 //更新微信绑定的手机号
...@@ -132,6 +135,12 @@ public class MdpController { ...@@ -132,6 +135,12 @@ public class MdpController {
return UserUtils.converToVo(user); return UserUtils.converToVo(user);
} }
@Auth(verifyLogin = false,verifyURL = false) @Auth(verifyLogin = false,verifyURL = false)
@RequestMapping(value = "/findUser",method = RequestMethod.GET)
public UserVo findUserById(@RequestParam String id){
User user = userService.findById(id);
return UserUtils.converToVo(user);
}
@Auth(verifyLogin = false,verifyURL = false)
@RequestMapping(value = "/decryptedData",method = RequestMethod.POST) @RequestMapping(value = "/decryptedData",method = RequestMethod.POST)
public Map<String,Object> decryptedData(@RequestBody DecryptedDataVo dataVo){ public Map<String,Object> decryptedData(@RequestBody DecryptedDataVo dataVo){
Map<String,Object> result = Maps.newConcurrentMap(); Map<String,Object> result = Maps.newConcurrentMap();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment