Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 eb4cfe7327323367a08ac449ce838f95b2e96783

Merge branch 'sanshuohuitang_dev' into huacheng_test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1302,4 +1302,10 @@
     * */
    @GetMapping("/isSanShuoExpert")
    R isExpert(@RequestParam("number") String number);

    /**
     * 删除用户专家权限
     * */
    @GetMapping("/removeExpertRole")
    R removeExpertRole(@RequestParam(value = "phone",required = false) String phone);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSanShuoExpertApi.java

@@ -98,7 +98,12 @@
        ComSanshuoExpert expert = comSanShuoExpertService.getById(id);
        expert.setStatus(0);
        expert.setDelFlag(0);
        return R.ok(comSanShuoExpertService.updateById(expert));
        boolean b = comSanShuoExpertService.updateById(expert);
        if (b){
            //删除专家账号的权限
            userService.removeExpertRole(expert.getPhone());
        }
        return R.ok();
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComSanShuoExpertServiceImpl.java

@@ -76,13 +76,13 @@
        expert.setId(Snowflake.getId());
        expert.setCreateTime(new Date());
        if (expert.getLevel()==2){
            expert.setIndustryCenterId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
            expert.setIndustryCenterId(Long.parseLong(expert.getUnitId()));
            expert.setUnit(comSanshuoIndustryCenterDao.selectById(expert.getUnitId()).getName()+"调解站");
        }else if(expert.getLevel()==3){
            expert.setStreetId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
            expert.setStreetId(Long.parseLong(expert.getUnitId()));
            expert.setUnit(comStreetDAO.selectById(expert.getUnitId()).getName()+"调解站");
        }else if(expert.getLevel()==4){
            expert.setCommunityId(Long.parseLong(comSanshuoExpertDTO.getUnitId()));
            expert.setCommunityId(Long.parseLong(expert.getUnitId()));
            expert.setUnit(comActDAO.selectById(expert.getUnitId()).getName()+"调解站");
        }
        expert.setStatus(1);

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java

@@ -1470,6 +1470,14 @@
        return userService.resetPassExpertOrIndustryCenter(account,password);
    }

    /**
     * 移除账号专家权限
     *
     */
    @GetMapping("/removeExpertRole")
    public R removeExpertRole(@RequestParam(value = "phone",required = false)String phone){
        return userService.removeExpertRole(phone);
    }

    @GetMapping("/accept")
    public R accept(@RequestParam("userId")Long userId){

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -940,4 +940,9 @@
    R accept(Long userId);

    R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO);

    /**
     * 移除专家权限
     * */
    R removeExpertRole(String phone);
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -3754,6 +3754,7 @@
        //是否存在相同账号
        SysUserDO userDO = userDao.selectOne(new QueryWrapper<SysUserDO>().eq("account", administratorsUserVO.getAccount()));
        if (isNull(userDO)){
            sysUserDO.setAppId("wx0cef797390444b75");
            sysUserDO.setCreateAt(new Date());
            sysUserDO.setUserId(administratorsUserVO.getUserId());
            sysUserDO.setAccount(administratorsUserVO.getAccount());
@@ -3771,6 +3772,13 @@
            sysUserRole.setUserId(sysUserDO.getUserId());
            if (sysUserDO.getType().equals(11)){
                sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_EXPERT_ROLE));
                //将专家小程序账号设置为专家权限
                SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 1).eq(SysUserDO::getPhone, administratorsUserVO.getPhone()));
                if (nonNull(sysUserDO1)){
                    sysUserDO1.setType(13);
                    userDao.updateById(sysUserDO1);
                    log.info("添加专家小程序账号权限");
                }
            }else{
                sysUserRole.setRoleId(Long.parseLong(UserConstants.SANSHUO_INDUSTRY_CENTER_ROLE));
            }
@@ -3795,6 +3803,31 @@
        return R.fail("修改失败");
    }

    /**
     * 移除专家权限
     * */
    @Override
    public R removeExpertRole(String phone) {
        if (nonNull(phone)){
            //是否有权限为专家的账号
            SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 11).eq(SysUserDO::getPhone, phone));
            if (nonNull(sysUserDO)){
                //删除后台账号
                sysUserDO.setStatus(2);
                userDao.updateById(sysUserDO);
                log.info("禁用专家后台账号成功");
            }
            //小程序账号移除专家权限
            SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 13).eq(SysUserDO::getPhone, phone));
            if (nonNull(sysUserDO1)){
                sysUserDO1.setType(1);
                userDao.updateById(sysUserDO1);
                log.info("移除专家权限成功");
            }
        }
        return R.ok();
    }


    @Override
    public R getAreaAndStreet() {