From 7034041e18f2354ac0f4b852f17a09b2144e1091 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 13 五月 2021 09:31:51 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 379ab94..88209fa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -253,6 +253,7 @@
loginUserInfoVO.setIsmemberrole(1);
}
}
+ loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);
return R.ok(loginUserInfoVO);
}
@@ -513,10 +514,29 @@
*/
@Override
public R putUserIsVolunteer(String phone, int type) {
+
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setIsVolunteer(type);
+ //????根据手机号匹配
int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone));
if (update > 0) {
+ ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
+ if(comMngVolunteerMngVO!=null&&comMngVolunteerMngVO.getSubmitUserId()!=null) {
+ Long userId = comMngVolunteerMngVO.getSubmitUserId();
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + userId;
+ stringRedisTemplate.delete(userKey);
+ }else{
+ List<SysUserDO> userDOList = userDao.selectList(new LambdaQueryWrapper<SysUserDO>().eq(SysUserDO::getPhone, phone));
+ if(userDOList!=null && userDOList.size()>0){
+ userDOList.forEach(usrDo ->{
+ Long userId = usrDo.getUserId();
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + userId;
+ stringRedisTemplate.delete(userKey);
+ });
+ }
+ }
return R.ok();
}
return R.fail();
@@ -546,6 +566,9 @@
}
int update = userDao.updateById(sysUserDO);
if (update > 0) {
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + userId;
+ stringRedisTemplate.delete(userKey);
return R.ok();
}
}
@@ -593,8 +616,9 @@
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setName(name);
sysUserDO.setIdCard(idCard);
- sysUserDO.setSex(loginUserInfoVO.getSex());
- sysUserDO.setBirthday(loginUserInfoVO.getBirthday());
+ //通过身份证号判断性别以及出生日期
+ sysUserDO.setSex(IdCard.sex(idCard));
+ sysUserDO.setBirthday(IdCard.birthDay(idCard));
sysUserDO.setJob(loginUserInfoVO.getJob());
sysUserDO.setUserId(loginUserInfoVO.getUserId());
sysUserDO.setFaceUrl(loginUserInfoVO.getFaceUrl());
@@ -1426,7 +1450,12 @@
SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard,idCard).eq(SysUserDO::getType,1));
if(sysUserDO != null){
sysUserDO.setIsPartymember(1);
- userDao.updateById(sysUserDO);
+ int updated = userDao.updateById(sysUserDO);
+ if(updated>0){
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ }
log.info("新增党员修改用户党员状态成功 身份证号【{}】", idCard);
}
return R.ok();
@@ -1443,7 +1472,12 @@
SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard,idCard).eq(SysUserDO::getType,1));
if(sysUserDO != null){
sysUserDO.setIsPartymember(0);
- userDao.updateById(sysUserDO);
+ int updated = userDao.updateById(sysUserDO);
+ if(updated>0) {
+ //删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ }
log.info("新增党员修改用户为非党员状态成功 身份证号【{}】", idCard);
}
return R.ok();
--
Gitblit v1.7.1