修改新增社区 不同区域同名字社区添加报错

lidongdong

2023-07-05 e2970b6e0050a480c799cb0aae255a9da04740b1

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

@@ -548,6 +548,9 @@
        if (nonNull(sysUser)){
            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
            loginUserInfoVO.setBackstageType(5);
            Long storeId = userDao.selectStoreIdIdByUserId(sysUser.getUserId());
            loginUserInfoVO.setStoreIdId(storeId);

        }
        //是否为物业公司账号
        if (nonNull(sysUserDO.getPhone())){
@@ -883,6 +886,18 @@
        if (sysUserDO.getBindingCheckUnitId() != null) {
            loginUserInfoVO.setBackstageType(4);
        }
        //判断是否是商家账号
        Long storeId = userDao.selectStoreIdIdByUserId(sysUserDO.getUserId());
        if (null != storeId){
            loginUserInfoVO.setBackstageUserId(sysUserDO.getUserId());
            loginUserInfoVO.setBackstageType(5);
            loginUserInfoVO.setStoreIdId(storeId);
        }

        SysUserRoleDO sysUserRoleDO=sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>()
                .lambda().eq(SysUserRoleDO::getUserId,sysUserDO.getUserId()));
        loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId().toString());

        return R.ok(loginUserInfoVO);
    }

@@ -1241,6 +1256,15 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R addUserBackstage(AdministratorsUserVO administratorsUserVO) {

        List<SysUserDO> list=userDao.selectList(new QueryWrapper<SysUserDO>().lambda().
                       eq(SysUserDO::getAppId,administratorsUserVO.getAppid()).
                eq(SysUserDO::getAccount,administratorsUserVO.getAccount()));
        if(list!=null && list.size()>0)
        {
            return R.fail("账户已存在！");
        }

        ComActVO comActVO = userDao.selectCommunity(administratorsUserVO.getCommunityId());
        if (nonNull(comActVO)) {
            List<ComAreaTownCommunityVO> areaTownList = userDao.selectAreaTownCommunity(comActVO.getName());
@@ -1273,6 +1297,7 @@
            }
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            sysRoleDO.setRoleId(Snowflake.getId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert > 0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1292,6 +1317,7 @@
            sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            sysRoleDO.setRoleId(Snowflake.getId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert > 0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(
@@ -1390,10 +1416,10 @@
            }
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            SysRoleDO sysRoleDO1 = roleDAO.selectOne(
            List<SysRoleDO> sysRoleDO1 = roleDAO.selectList(
                    new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
            if (sysRoleDO1 != null) {
                sysRoleDO = sysRoleDO1;
            if (sysRoleDO1 != null && sysRoleDO1.size()>0 ) {
                sysRoleDO = sysRoleDO1.get(0);
                roleId = sysRoleDO.getRoleId();
            } else {
                roleDAO.insert(sysRoleDO);
@@ -3405,7 +3431,7 @@
        }
        Map<String, String> headerMap = new HashMap<>();
        headerMap.put("appid", appId);
        String resultJson = HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province=" + uuLoginVO.getProvince() + "&city=" + uuLoginVO.getCity() + "&area=" + uuLoginVO.getArea() + "&appid=" + appId + "&timestamp=" + uuLoginVO.getTimestamp() + "&sign=" + uuLoginVO.getSign() + "&mobile=" + uuLoginVO.getMobile() + "&couponId=" + uuLoginVO.getCouponId(), headerMap, null);
        String resultJson = HttpClientUtil.get("https://uu-api.imashuo.com/member/wx/get-access?province=" + uuLoginVO.getProvince() + "&city=" + uuLoginVO.getCity() + "&area=" + uuLoginVO.getArea() + "&appid=" + appId + "&timestamp=" + uuLoginVO.getTimestamp() + "&sign=" + uuLoginVO.getSign() + "&mobile=" + uuLoginVO.getMobile() + "&couponId=" + uuLoginVO.getCouponId(), headerMap, null);
        JSONObject result = JSON.parseObject(resultJson);
        if (result.get("status").equals(1)) {
            return R.ok(result.get("data"));
@@ -3765,16 +3791,16 @@
    @Override
    public R getAllCommunityList() {
        List<Integer> areaList = areaCodeList();
        List<AreaVOS> areaVOList = new ArrayList<>();
        List<AreaVOStr> areaVOList = new ArrayList<>();
        for (Integer code : areaList) {
            AreaVOS areaVO = new AreaVOS();
            areaVO.setId(code);
            AreaVOStr areaVO = new AreaVOStr();
            areaVO.setId(code+"");
            areaVO.setName(areaCodeToName(code.longValue()));
            List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
            Iterator<StreetVOS> iterator = streetVOS.listIterator();
            List<StreetVOStr> streetVOS = userDao.selectStreetByAreaCodeStr(code);
            Iterator<StreetVOStr> iterator = streetVOS.listIterator();
            while (iterator.hasNext()) {
                StreetVOS vo = iterator.next();
                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
                StreetVOStr vo = iterator.next();
                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(Long.parseLong(vo.getId()), 3);
                vo.setChildList(communityVOS);

            }