修改西区uu洗车登录接口500 7

lidongdong

2024-04-01 cdca957e4835e359a89fe4c7c9833ab0c78ee4e3

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

@@ -343,6 +343,7 @@
        if (nonNull(sysUserDO.getStreetId())){
            loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
        }
        loginUserInfoVO.setLoveIntegral(sysUserDO.getLoveIntegral());
        loginUserInfoVO.setUserId(sysUserDO.getUserId());
        loginUserInfoVO.setName(sysUserDO.getName());
        loginUserInfoVO.setPassword(sysUserDO.getPassword());
@@ -380,6 +381,13 @@
                loginUserInfoVO.setIsDpcMember(1);
            }
        }
        //是否为物业公司账号
        if (nonNull(sysUserDO.getPhone())){
            Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
            if (nonNull(propertyAccount)){
                loginUserInfoVO.setPropertyId(propertyAccount);
            }
        }
        return R.ok(loginUserInfoVO);
    }

@@ -398,6 +406,7 @@
        }
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
        loginUserInfoVO.setLoveIntegral(sysUserDO.getLoveIntegral());
        List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
        Set<String> set = new HashSet<>();
        if (!ObjectUtils.isEmpty(roleDOList)) {
@@ -541,6 +550,16 @@
        if (nonNull(sysUser)){
            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
            loginUserInfoVO.setBackstageType(5);
            Long storeId = userDao.selectStoreIdIdByUserId(sysUser.getUserId());
            loginUserInfoVO.setStoreIdId(storeId);

        }
        //是否为物业公司账号
        if (nonNull(sysUserDO.getPhone())){
            Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());
            if (nonNull(propertyAccount)){
                loginUserInfoVO.setPropertyId(propertyAccount);
            }
        }
        //获取自提点账号
        if (StrUtil.isNotBlank(sysUserDO.getPhone())){
@@ -783,12 +802,14 @@
     * @return 人员详情
     */
    @Override
    public R<LoginUserInfoVO> detailUser(Long userId) {
    public R<LoginUserInfoVO> detailUser(Long userId)
    {
        LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
        SysUserDO sysUserDO = userDao.selectById(userId);
        if (ObjectUtils.isEmpty(sysUserDO)) {
            return R.fail("人员不存在");
        }

        BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
        List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO
                .selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
@@ -868,6 +889,20 @@
        }
        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()));
        if(sysUserRoleDO!=null && sysUserRoleDO.getRoleId()!=null )
        {
            loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId()+"");
        }
        return R.ok(loginUserInfoVO);
    }
@@ -1227,6 +1262,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());
@@ -1259,11 +1303,29 @@
            }
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert > 0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(
                        new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
                roleId = sysRoleDO1.getRoleId();
            sysRoleDO.setRoleId(Snowflake.getId());

            SysRoleDO sysRoleDOSelext = roleDAO.selectOne(
                    new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));

            if(sysRoleDOSelext==null)
            {
                int insert = roleDAO.insert(sysRoleDO);
                if (insert > 0) {
                    SysRoleDO sysRoleDO1 = roleDAO.selectOne(
                            new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
                    roleId = sysRoleDO1.getRoleId();
                    // 新角色设置所有权限
                    MenuRoleVO menuRoleVO = new MenuRoleVO();
                    menuRoleVO.setIsAll(1);
                    menuRoleVO.setCommunityId(communityId);
                    menuRoleVO.setRoleId(roleId);
                    this.putMenuRole(menuRoleVO);
                }
            }
            else
            {
                roleId = sysRoleDOSelext.getRoleId();
                // 新角色设置所有权限
                MenuRoleVO menuRoleVO = new MenuRoleVO();
                menuRoleVO.setIsAll(1);
@@ -1271,6 +1333,7 @@
                menuRoleVO.setRoleId(roleId);
                this.putMenuRole(menuRoleVO);
            }

        }
        if (roleId.intValue() == 777777777) {
            SysRoleDO sysRoleDO = new SysRoleDO();
@@ -1278,11 +1341,47 @@
            sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(administratorsUserVO.getUserId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert > 0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(
                        new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
                roleId = sysRoleDO1.getRoleId();
            sysRoleDO.setRoleId(Snowflake.getId());

            SysRoleDO sysRoleDOSelext = roleDAO.selectOne(
                    new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));

            if(sysRoleDOSelext==null)
            {
                int insert = roleDAO.insert(sysRoleDO);
                if (insert > 0) {
                    SysRoleDO sysRoleDO1 = roleDAO.selectOne(
                            new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
                    roleId = sysRoleDO1.getRoleId();
                    // 新街道管理员角色设置固定三社权限
                    MenuRoleVO menuRoleVO = new MenuRoleVO();
                    List<Long> menu = new ArrayList<>();
                    if (administratorsUserVO.getSocialType() == 1) {
                        menu.add(233L);
                        menu.add(234L);
                        menu.add(235L);
                        menu.add(236L);
                        menu.add(237L);
                    } else if (administratorsUserVO.getSocialType() == 2) {
                        menu.add(233L);
                        menu.add(234L);
                        menu.add(236L);
                        menu.add(237L);
                        menu.add(238L);
                    } else if (administratorsUserVO.getSocialType() == 3) {
                        menu.add(233L);
                        menu.add(237L);
                    } else {
                        menuRoleVO.setIsAll(1);
                    }
                    menuRoleVO.setMenuIds(menu);
                    menuRoleVO.setRoleId(roleId);
                    this.putMenuRole(menuRoleVO);
                }
            }
            else
            {
                roleId = sysRoleDOSelext.getRoleId();
                // 新街道管理员角色设置固定三社权限
                MenuRoleVO menuRoleVO = new MenuRoleVO();
                List<Long> menu = new ArrayList<>();
@@ -1308,6 +1407,7 @@
                menuRoleVO.setRoleId(roleId);
                this.putMenuRole(menuRoleVO);
            }

        }
        SysRoleDO roleDO = roleDAO.selectById(roleId);
        if (ObjectUtils.isEmpty(roleDO)) {
@@ -1374,13 +1474,12 @@
                menu.add(300L);
                menu.add(303L);
            }

            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);
@@ -1391,9 +1490,8 @@
                this.putMenuRole(menuRoleVO);
            }
        }
        if (administratorsUserVO.getType().equals(20)){
            roleId=1559112102373756548L;
        }
        log.info("======================type"+administratorsUserVO.getType());
        log.info("=======================roleId"+roleId);
        SysRoleDO roleDO = roleDAO.selectById(roleId);
        if (ObjectUtils.isEmpty(roleDO)) {
            return R.fail("角色不存在");
@@ -1401,6 +1499,9 @@
        String encode = new BCryptPasswordEncoder().encode(administratorsUserVO.getPassword());
        administratorsUserVO.setPassword(encode);
        BeanUtils.copyProperties(administratorsUserVO, sysUserDO);
        if (nonNull(administratorsUserVO.getAppid())){
            sysUserDO.setAppId(administratorsUserVO.getAppid());
        }
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
@@ -1414,7 +1515,6 @@
            } else if (e.getMessage().contains("23000")) {
                throw new ServiceException("手机号已存在");
            }

        }
        if (insert > 0) {
            SysUserDO sysUserDO1 = userDao
@@ -3389,14 +3489,47 @@
        } catch (Exception e) {
            e.printStackTrace();
        }
        Map<String, String> headerMap = new HashMap<>();
        Map<String, Object> 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);
        JSONObject result = JSON.parseObject(resultJson);
        if (result.get("status").equals(1)) {
            return R.ok(result.get("data"));

        String str="https://uu-api.imashuo.com/member/wx/get-access?"+ "appid=" + appId +
                "&timestamp=" + uuLoginVO.getTimestamp() +
                "&sign=" + uuLoginVO.getSign() +
                "&mobile=" + uuLoginVO.getMobile();

        if(!StringUtils.isEmpty(uuLoginVO.getProvince()))
        {
            str=str+"&province=" + uuLoginVO.getProvince();
        }
        return R.fail("信息错误");


        if(!StringUtils.isEmpty(uuLoginVO.getCity()))
        {
            str=str+"&city=" + uuLoginVO.getCity();
        }

        if(!StringUtils.isEmpty(uuLoginVO.getArea()))
        {
            str=str+"&area=" + uuLoginVO.getArea();
        }

        if(!StringUtils.isEmpty(uuLoginVO.getCouponId()))
        {
            str=str+"&couponId=" + uuLoginVO.getCouponId();
        }

//        String resultJson = HttpClientUtil.get("https://uu-api.imashuo.com/member/wx/get-acces.s?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 = null;
        try {
            resultJson = HttpClientUtil.httpGet(str  ,headerMap,10000 ,null);
        } catch (Exception e) {
            e.printStackTrace();
        }
        JSONObject result = JSON.parseObject(resultJson);
//        if (result.get("status").equals(1)) {
//            return R.ok(result.get("data")+"   "+resultJson);
//        }
        return R.fail("信息错误"+"   "+resultJson);
    }

    @Override
@@ -3751,16 +3884,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);

            }
@@ -3993,17 +4126,30 @@

    @Override
    public R feedBackReply(SysUserFeedbackVO sysUserFeedbackVO) {
        SysUserFeedbackDO sysUserFeedbackDO=new SysUserFeedbackDO();
        BeanUtils.copyProperties(sysUserFeedbackVO, sysUserFeedbackDO);
        return R.ok(sysUserFeedbackDAO.updateById(sysUserFeedbackDO));
        if (isNull(sysUserFeedbackVO.getReply())){
            return R.fail("回复内容不能为空");
        }
        SysUserFeedbackDO sysUserFeedbackDO1 = sysUserFeedbackDAO.selectById(sysUserFeedbackVO.getId());
        sysUserFeedbackDO1.setReply(sysUserFeedbackVO.getReply());
        return R.ok(sysUserFeedbackDAO.reply(sysUserFeedbackDO1));
    }

    @Override
    public R myFeedBack(Long id,Integer type) {
        List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id));
    public R myFeedBack(Long id,Integer type,Long propertyId) {
        List<SysUserFeedbackDO> sysUserFeedbackDOS = sysUserFeedbackDAO.selectList(new QueryWrapper<SysUserFeedbackDO>().lambda().eq(SysUserFeedbackDO::getType, type).eq(SysUserFeedbackDO::getUserId, id).eq(SysUserFeedbackDO::getPropertyId,propertyId ));
        return R.ok(sysUserFeedbackDOS);
    }

    @Override
    public R propertyCheck(String phone) {
        Long propertyAccount = userDao.isPropertyAccount(phone);
        log.info("==============物业公司id"+propertyAccount);
        if (isNull(propertyAccount)){
            return R.fail();
        }
        return R.ok(propertyAccount);
    }


    @Override
    public R getAreaAndStreet() {