|
|
@@ -1197,7 +1197,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
hpUser1 = hpUserList.get(0);
|
|
|
}
|
|
|
//判断用户是否注销
|
|
|
- if (hpUser1.getUseFlag()==1 || hpUser1.getUseFlag()==2) {
|
|
|
+ if (hpUser1.getUseFlag() == 1 || hpUser1.getUseFlag() == 2) {
|
|
|
returnMap.put("success", "4000");
|
|
|
return returnMap;
|
|
|
}
|
|
|
@@ -1763,6 +1763,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
String clientId = requestMap.get("client_id");
|
|
|
//只有一个code的时候,获取用户凭证
|
|
|
JSONObject result = TokenUtil.getAccessToken(code);
|
|
|
+ logger.info("微信授权code===" + result.toString());
|
|
|
String openId = result.getString("openid");
|
|
|
String accessToken = result.getString("access_token");
|
|
|
String unionId = result.getString("unionid");
|
|
|
@@ -1792,7 +1793,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
}
|
|
|
}
|
|
|
//判断用户是否注销
|
|
|
- if (hpUser.getUseFlag()==1 || hpUser.getUseFlag()==2) {
|
|
|
+ if (hpUser.getUseFlag() == 1 || hpUser.getUseFlag() == 2) {
|
|
|
returnMap.put("success", "4000");
|
|
|
return returnMap;
|
|
|
}
|
|
|
@@ -1949,7 +1950,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
}
|
|
|
}
|
|
|
//判断用户是否注销
|
|
|
- if (hpUser.getUseFlag()==1 || hpUser.getUseFlag()==2) {
|
|
|
+ if (hpUser.getUseFlag() == 1 || hpUser.getUseFlag() == 2) {
|
|
|
returnMap.put("success", "4000");
|
|
|
return returnMap;
|
|
|
}
|
|
|
@@ -2345,7 +2346,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
}
|
|
|
}
|
|
|
//判断用户是否注销
|
|
|
- if (hpUser1.getUseFlag()==1 || hpUser1.getUseFlag()==2) {
|
|
|
+ if (hpUser1.getUseFlag() == 1 || hpUser1.getUseFlag() == 2) {
|
|
|
returnMap.put("success", "4000");
|
|
|
return returnMap;
|
|
|
}
|
|
|
@@ -2480,7 +2481,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
}
|
|
|
}
|
|
|
//判断用户是否注销
|
|
|
- if (hpUser.getUseFlag()==1 || hpUser.getUseFlag()==2) {
|
|
|
+ if (hpUser.getUseFlag() == 1 || hpUser.getUseFlag() == 2) {
|
|
|
returnMap.put("success", "4000");
|
|
|
return returnMap;
|
|
|
}
|
|
|
@@ -2763,7 +2764,7 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
public int findSumUser() {
|
|
|
return mapper.findSumUser();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 修改手机号
|
|
|
*
|
|
|
@@ -2777,51 +2778,51 @@ public class HpUserService extends CrudService<HpUserMapper, HpUser> {
|
|
|
String userToken = requestMap.get("user_token");
|
|
|
String memberId = requestMap.get("member_id");
|
|
|
String newPhone = requestMap.get("new_phone");
|
|
|
-
|
|
|
+
|
|
|
//验证用户是否处于登录态
|
|
|
if (TokenUtil.validateLogin(memberId, userId)) {
|
|
|
//验证用户合法性
|
|
|
if (TokenUtil.validateToken(userId, userToken)) {
|
|
|
- HpUser hpUser = this.get(userId);
|
|
|
- //验证用户手机号修改的新手机号与旧手机号相同
|
|
|
- if(hpUser!=null && !hpUser.getPhone().equals(newPhone)) {
|
|
|
- HpUser user = new HpUser();
|
|
|
- user.setPhone(newPhone);
|
|
|
- List<HpUser> list = mapper.findByPhone_new(user);
|
|
|
- //验证用户新手机号是否已存在
|
|
|
- if (list != null && list.size()>0) {
|
|
|
- //新手机号是否已存在
|
|
|
- returnMap.put("success", "1007");
|
|
|
- } else {
|
|
|
- if ("check_phone".equals(type)) {//不去修改手机号,仅仅只是校验修改手机号之前的验证(前端在修改手机号时, 点击发送验证码时校验手机号的动作时使用)
|
|
|
- return returnMap;
|
|
|
- } else { //去修改手机号
|
|
|
- //修改用户表(user)中手机号
|
|
|
- hpUser.setPhone(newPhone);
|
|
|
- this.save(hpUser);
|
|
|
-
|
|
|
- //修改会员表(member)中手机号
|
|
|
- HpMember hpMember = hpMemberService.get(memberId);
|
|
|
- hpMember.setPhone(newPhone);
|
|
|
- hpMemberService.save(hpMember);
|
|
|
-
|
|
|
- //有简历的话手机号同步到简历
|
|
|
- HpResume hpResume=hpResumeService.getByMemberId(memberId);
|
|
|
- if(hpResume!=null){
|
|
|
- hpResume.setPhone(newPhone);
|
|
|
- hpResumeService.save(hpResume);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }else {
|
|
|
- returnMap.put("success", "2007");//需要修改的新手机号码与原来的手机号码相同
|
|
|
- }
|
|
|
+ HpUser hpUser = this.get(userId);
|
|
|
+ //验证用户手机号修改的新手机号与旧手机号相同
|
|
|
+ if (hpUser != null && !hpUser.getPhone().equals(newPhone)) {
|
|
|
+ HpUser user = new HpUser();
|
|
|
+ user.setPhone(newPhone);
|
|
|
+ List<HpUser> list = mapper.findByPhone_new(user);
|
|
|
+ //验证用户新手机号是否已存在
|
|
|
+ if (list != null && list.size() > 0) {
|
|
|
+ //新手机号是否已存在
|
|
|
+ returnMap.put("success", "1007");
|
|
|
+ } else {
|
|
|
+ if ("check_phone".equals(type)) {//不去修改手机号,仅仅只是校验修改手机号之前的验证(前端在修改手机号时, 点击发送验证码时校验手机号的动作时使用)
|
|
|
+ return returnMap;
|
|
|
+ } else { //去修改手机号
|
|
|
+ //修改用户表(user)中手机号
|
|
|
+ hpUser.setPhone(newPhone);
|
|
|
+ this.save(hpUser);
|
|
|
+
|
|
|
+ //修改会员表(member)中手机号
|
|
|
+ HpMember hpMember = hpMemberService.get(memberId);
|
|
|
+ hpMember.setPhone(newPhone);
|
|
|
+ hpMemberService.save(hpMember);
|
|
|
+
|
|
|
+ //有简历的话手机号同步到简历
|
|
|
+ HpResume hpResume = hpResumeService.getByMemberId(memberId);
|
|
|
+ if (hpResume != null) {
|
|
|
+ hpResume.setPhone(newPhone);
|
|
|
+ hpResumeService.save(hpResume);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ returnMap.put("success", "2007");//需要修改的新手机号码与原来的手机号码相同
|
|
|
+ }
|
|
|
} else {
|
|
|
returnMap.put("success", "1004");
|
|
|
}
|
|
|
} else {
|
|
|
returnMap.put("success", "2010");
|
|
|
- }
|
|
|
+ }
|
|
|
return returnMap;
|
|
|
}
|
|
|
}
|