add:添加小程序实名认证接口过滤（部分）

CeDo

2021-05-01 a7d2d03fe177a58c22e960e9c87b32f7b05be74f

 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)) {
@@ -230,6 +232,7 @@
        loginUserInfoVO.setIsmemberrole(2);
//        志愿者状态
        String phone = sysUserDO.getPhone();
        Long userCommunityId = sysUserDO.getCommunityId();
        if (!ObjectUtils.isEmpty(phone)) {
            ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
            if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
@@ -238,9 +241,10 @@
                int state = comMngVolunteerMngVO.getState().intValue();
                loginUserInfoVO.setVolunteerStatus(state);
            }
            Integer countTeam = userDao.selectCountTeam(phone);
            Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
            Integer isSysUser = userDao.selectCountSysUser(phone);
            //是否是"管理员"或者 本社区 "社区团队"、"党委成员"
            Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
            Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId);
            Integer isSysUser = userDao.selectCountSysUser(phone, userCommunityId);
            if (countTeam != null && countTeam > 0) {
                loginUserInfoVO.setIsmemberrole(1);
            } else if (selectCountMemberRole != null && selectCountMemberRole > 0) {
@@ -249,6 +253,7 @@
                loginUserInfoVO.setIsmemberrole(1);
            }
        }
        loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard()!=null);
        return R.ok(loginUserInfoVO);
    }

@@ -415,7 +420,7 @@

    /**
     * 人员详情
     *
     *detailuser
     * @param userId 用户id
     * @return 人员详情
     */
@@ -532,12 +537,12 @@
        sysUserDO.setUserId(userId);

        SysUserDO userInDB = userDao.selectById(userId);
        if(userInDB!=null) {
            boolean isVol = userInDB.getIsVolunteer()==1;
            if(isVol){
        if (userInDB != null) {
            boolean isVol = userInDB.getIsVolunteer() == 1;
            if (isVol) {
                return R.fail("用户已是志愿者");
            }
            if(userInDB.getType()!=1){
            if (userInDB.getType() != 1) {
                return R.fail("用户不是小程序用户");
            }
            int update = userDao.updateById(sysUserDO);
@@ -547,6 +552,7 @@
        }
        return R.fail();
    }

    /**
     * 用户绑定社区、小区
     *
@@ -600,6 +606,14 @@
        }
        int update = userDao.updateById(sysUserDO);
        if (update > 0) {
            //实名认证成功查询是否有已审核的党员信息，有则更新党员信息绑定党员的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();
@@ -709,11 +723,12 @@
     * @return 成员集合
     */
    @Override
    public R listFamily(Long userId) {
    public R listFamily(Long userId,Long pageNum, Long pageSize) {
        List<ComMngFamilyInfoVO> comMngFamilyInfoVOS = new ArrayList<>();
        List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
        if (!ObjectUtils.isEmpty(comMngFamilyInfoDOS)) {
            comMngFamilyInfoDOS.forEach(comMngFamilyInfoDO -> {
        LambdaQueryWrapper<ComMngFamilyInfoDO> query = new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId);
        IPage<ComMngFamilyInfoDO> pageData = comMngFamilyInfoDAO.selectPage(new Page<>(pageNum,pageSize), query);
        if (!ObjectUtils.isEmpty(pageData.getRecords())) {
            pageData.getRecords().forEach(comMngFamilyInfoDO -> {
                ComMngFamilyInfoVO comMngFamilyInfoVO = new ComMngFamilyInfoVO();
                BeanUtils.copyProperties(comMngFamilyInfoDO, comMngFamilyInfoVO);
                comMngFamilyInfoVOS.add(comMngFamilyInfoVO);
@@ -736,6 +751,7 @@
        if (!ObjectUtils.isEmpty(comMngFamilyInfoDO1)) {
            return R.fail("家庭成员已经存在");
        }
        comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard()));
        int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO);
        if (insert > 0) {
            return R.ok();
@@ -753,6 +769,7 @@
    public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
        ComMngFamilyInfoDO comMngFamilyInfoDO = new ComMngFamilyInfoDO();
        BeanUtils.copyProperties(comMngFamilyInfoVO, comMngFamilyInfoDO);
        comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard()));
        int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO);
        if (update > 0) {
            return R.ok();
@@ -1403,14 +1420,13 @@
     */
    @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();
    }

    /**
@@ -1498,10 +1514,13 @@
            String idCard = sysUserDO.getIdCard();
            if (!ObjectUtils.isEmpty(idCard)) {
                communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));
                communityUserInfoVO.setBirthday(IdCard.birthDay(idCard));
                communityUserInfoVO.setBirthday(sysUserDO.getBirthday());
                communityUserInfoVO.setIdCard(idCard);
            }
            communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt());
            communityUserInfoVO.setCardPhotoBack(sysUserDO.getCardPhotoBack());
            communityUserInfoVO.setCardPhotoFront(sysUserDO.getCardPhotoFront());
            communityUserInfoVO.setFamilyBook(sysUserDO.getFamilyBook());
            communityUserInfoVO.setName(sysUserDO.getName());
            String phone = sysUserDO.getPhone();
            communityUserInfoVO.setPhone(phone);
@@ -1702,4 +1721,26 @@
            return R.fail();
        }
    }

    @Override
    public R getUserArchives(Long userId) {
        //查询用户信息
        SysUserDO userDO = userDao.selectById(userId);
        if (userDO == null) {
            return R.fail("未查询到用户信息");
        }
        UserArchivesVO userArchivesVO = new UserArchivesVO();
        BeanUtils.copyProperties(userDO, userArchivesVO);
        userArchivesVO.setUserId(userDO.getUserId());
        return R.ok(userArchivesVO);
    }

    @Override
    public R updateUserArchives(UpdateUserArchivesVO userArchivesVO) {
        if(userArchivesVO.getUserId()==null){
            return R.fail("未查询到用户信息");
        }
        userDao.updateUserArchives(userArchivesVO);
        return R.ok();
    }
}