From a33990498e32fda774dacf849bfcd660c58da8e7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 四月 2022 15:22:17 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_paicha
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 3ac3bce..09ae33b 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
@@ -20,6 +20,7 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
+import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsLoginUserInfoVO;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.entity.SysAppConfig;
@@ -378,6 +379,7 @@
loginUserInfoVO.setIsPropertyWorker(2);
loginUserInfoVO.setIsSocialWorker(2);
loginUserInfoVO.setIsFmsMember(2);
+ loginUserInfoVO.setIsAcidMember(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
@@ -416,6 +418,12 @@
int countFmsMember = userDao.countFmsMember(phone, userCommunityId);
if (countFmsMember > 0) {
loginUserInfoVO.setIsFmsMember(1);
+ }
+ //是否是防疫工作人员
+ ComActAcidMemberVO acidMember = userDao.selectAcidMemberByPhone(phone);
+ if (nonNull(acidMember)) {
+ loginUserInfoVO.setIsAcidMember(1);
+ loginUserInfoVO.setRelationName(acidMember.getRelationName());
}
//是否网格员
int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
@@ -728,6 +736,13 @@
//是否微团队成员
int countFmsMember = userDao.countFmsMember(loginUserInfoVO.getPhone(), loginUserInfoVO.getCommunityId());
loginUserInfoVO.setIsFmsMember(countFmsMember > 0 ? 1 : 0);
+ //是否是防疫工作人员
+ loginUserInfoVO.setIsAcidMember(2);
+ ComActAcidMemberVO acidMember = userDao.selectAcidMemberByPhone(loginUserInfoVO.getPhone());
+ if (nonNull(acidMember)) {
+ loginUserInfoVO.setIsAcidMember(1);
+ loginUserInfoVO.setRelationName(acidMember.getRelationName());
+ }
loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
//判断账号类型
@@ -1975,6 +1990,30 @@
/**
* 修改用户的党员状态
*
+ * @param phone
+ * 身份证号
+ * @return 修改结果
+ */
+ @Override
+ public R updateUserIsPartymemberByPhone(String phone) {
+ SysUserDO sysUserDO = userDao.selectOne(
+ new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1));
+ if (sysUserDO != null) {
+ sysUserDO.setIsPartymember(1);
+ int updated = userDao.updateById(sysUserDO);
+ if (updated > 0) {
+ // 删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + sysUserDO.getUserId();
+ stringRedisTemplate.delete(userKey);
+ }
+ log.info("新增党员修改用户党员状态成功 手机号【{}】", phone);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 修改用户的党员状态
+ *
* @param idCard
* 身份证号
* @return 修改结果
--
Gitblit v1.7.1