From 458a590d905246081332cba18997c9b5c68aa725 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 10 五月 2021 15:55:07 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 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 e4f9c9d..ece16a6 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
@@ -18,6 +18,7 @@
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.RealNameUtil;
import com.panzhihua.common.utlis.SensitiveUtil;
@@ -194,6 +195,7 @@
loginUserInfoVO.setStatus(sysUserDO.getStatus());
loginUserInfoVO.setAccount(name);
loginUserInfoVO.setType(sysUserDO.getType());
+ loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);//暂时 身份证判断实名制
List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
Set<String> set = new HashSet<>();
if (!ObjectUtils.isEmpty(roleDOList)) {
@@ -251,6 +253,7 @@
loginUserInfoVO.setIsmemberrole(1);
}
}
+ loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);
return R.ok(loginUserInfoVO);
}
@@ -586,7 +589,7 @@
log.info("用户实名认证发送请求，姓名：" + name + "身份证号码：" + idCard);
boolean b = RealNameUtil.authentication(idCard, name);
if (!b) {
- return R.fail("身份认证失败：公安系统认证错误");
+ return R.fail("身份认证失败：请填写真实信息");
}
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setName(name);
@@ -603,6 +606,17 @@
}
int update = userDao.updateById(sysUserDO);
if (update > 0) {
+ //清空缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + loginUserInfoVO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ //实名认证成功查询是否有已审核的党员信息，有则更新党员信息绑定党员的userId
+ Long memberId = userDao.getPartyBuildingByIdCard(idCard);
+ if(memberId != null){
+ sysUserDO.setIsPartymember(1);
+ userDao.updateById(sysUserDO);
+ //修改审核绑定的userId
+ userDao.updateComPbMemberUserId(idCard,sysUserDO.getUserId());
+ }
return R.ok();
}
return R.fail();
@@ -1367,6 +1381,7 @@
@Override
public R indexDataCommunityBackstage(Long communityId) {
IndexDataVO indexDataVO = userDao.indexDataCommunityBackstage(communityId);
+ //查询后台党员数量
return R.ok(indexDataVO);
}
@@ -1409,17 +1424,34 @@
*/
@Override
public R updateUserIsPartymember(String idCard) {
- SysUserDO sysUserDO = new SysUserDO();
- sysUserDO.setIsPartymember(1);
- int update = userDao.update(sysUserDO, new UpdateWrapper<SysUserDO>().lambda().eq(SysUserDO::getIdCard, idCard));
- if (update > 0) {
+ 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);
log.info("新增党员修改用户党员状态成功 身份证号【{}】", idCard);
- return R.ok();
}
- return R.fail();
+ return R.ok();
}
/**
+ * 修改用户的党员状态
+ *
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @Override
+ public R updateUserNotPartymember(String idCard) {
+ 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);
+ log.info("新增党员修改用户为非党员状态成功 身份证号【{}】", idCard);
+ }
+ return R.ok();
+ }
+
+
+ /**
* 获取各种协议
*
* @param type 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
--
Gitblit v1.7.1