新增商家线下订

lidongdong

2023-11-23 b3ea93fb8b59b2c7a0b505b6dd6114d933eeaa61

 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());
@@ -405,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)) {
@@ -800,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));
@@ -896,8 +900,10 @@

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

        if(sysUserRoleDO!=null && sysUserRoleDO.getRoleId()!=null )
        {
            loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId()+"");
        }
        return R.ok(loginUserInfoVO);
    }

@@ -1344,9 +1350,9 @@
            {
                int insert = roleDAO.insert(sysRoleDO);
                if (insert > 0) {
//                    SysRoleDO sysRoleDO1 = roleDAO.selectOne(
//                            new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleId, sysRoleDO.getRoleId()));
                    roleId = sysRoleDOSelext.getRoleId();
                    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<>();