Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-26 12b76fe84f792ab19f47b7cd4e52296a0cc94084

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

@@ -1603,6 +1603,7 @@

    /**
     * 新增SysUser
     *
     * @param storeVO   请求参数
     * @return  新增结果
     */
@@ -1610,39 +1611,26 @@
    public R addSysUser(ShopStoreVO storeVO){

        SysUserDO sysUserDO = new SysUserDO();
        Long roleId = 888888888L;
        if (roleId.intValue() == 999999999 || roleId.intValue() == 888888888) {
            Long communityId = 0L;
            //新增社区高级管理员角色
            SysRoleDO sysRoleDO = new SysRoleDO();
            if(roleId.intValue() == 999999999){
                sysRoleDO.setCommunityId(communityId);
                sysRoleDO.setRoleName("超级管理员");
                sysRoleDO.setRoleKey(Constants.ADMIN_SHOP_ROLE_KEY + communityId);
            }else{
                sysRoleDO.setCommunityId(0L);
                sysRoleDO.setRoleName(storeVO.getName());
                sysRoleDO.setRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
            }
            sysRoleDO.setRoleSort(0);
            sysRoleDO.setCreateBy(storeVO.getLoginUserId());
            int insert = roleDAO.insert(sysRoleDO);
            if (insert > 0) {
                SysRoleDO sysRoleDO1 = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, sysRoleDO.getRoleKey()));
                roleId = sysRoleDO1.getRoleId();
        if (insert < 0) {
            return R.fail();
        }
                //新角色设置所有权限
                MenuRoleVO menuRoleVO = new MenuRoleVO();
                menuRoleVO.setIsAll(1);
                menuRoleVO.setCommunityId(communityId);
                menuRoleVO.setRoleId(roleId);
        menuRoleVO.setRoleId(sysRoleDO.getRoleId());
                this.putMenuRole(menuRoleVO);
            }
        }

        SysRoleDO roleDO = roleDAO.selectById(roleId);
        if (ObjectUtils.isEmpty(roleDO)) {
            return R.fail("角色不存在");
        }
        //sys_user 表
        String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
        BeanUtils.copyProperties(storeVO, sysUserDO);
        sysUserDO.setAccount(storeVO.getStoreAccount());
@@ -1652,10 +1640,8 @@
        sysUserDO.setPhone(storeVO.getPhone());
        sysUserDO.setName(storeVO.getContacts());
        sysUserDO.setPassword(encode);
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);

            //把SysUserId赋值给店铺
            if(sysUserDO.getUserId() != null){
                userDao.updateStoreByPhone(storeVO.getPhone(),sysUserDO.getUserId());
@@ -1664,20 +1650,11 @@
            e.printStackTrace();
            log.error("新增后台用户报错【{}】", e.getMessage());
            if (e.getMessage().contains("union_phone_type")) {
                userDao.deleteStoreByPhoneAndStatus(storeVO.getPhone());
                roleDAO.deleteByRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
                throw new ServiceException("手机号已经存在");
            } else if (e.getMessage().contains("union_account_type")) {
                throw new ServiceException("账户已经存在");
            }
        }
        if (insert > 0) {
            SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getAccount, storeVO.getStoreAccount()));
            Long userId = sysUserDO1.getUserId();
            SysUserRoleDO sysUserRoleDO = new SysUserRoleDO();
            sysUserRoleDO.setUserId(userId);
            sysUserRoleDO.setRoleId(roleDO.getRoleId());
            int insert1 = sysUserRoleDAO.insert(sysUserRoleDO);
            if (insert1 > 0) {
                return R.ok();
            }
        }
        return R.fail();
@@ -1685,6 +1662,7 @@

    /**
     * 修改SysUser用户信息
     *
     * @param storeVO   请求参数
     * @return  修改结果
     */
@@ -1705,6 +1683,7 @@

    /**
     * 修改用户小程序首页活动提示
     *
     * @param userEditTipsDTO  请求参数
     * @return  修改结果
     */