no

DESKTOP-71BH0QO\L、ming

2021-04-26 18c60e1bde625fac03dd47b3d914488cf8be539f

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

@@ -518,6 +518,35 @@
        return R.fail();
    }


    /**
     * 修改用户志愿者状态
     *
     * @param userId 志愿者用户ID
     * @param type
     */
    @Override
    public R putUserIsVolunteerById(Long userId, int type) {
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setIsVolunteer(type);
        sysUserDO.setUserId(userId);

        SysUserDO userInDB = userDao.selectById(userId);
        if(userInDB!=null) {
            boolean isVol = userInDB.getIsVolunteer()==1;
            if(isVol){
                return R.fail("用户已是志愿者");
            }
            if(userInDB.getType()!=1){
                return R.fail("用户不是小程序用户");
            }
            int update = userDao.updateById(sysUserDO);
            if (update > 0) {
                return R.ok();
            }
        }
        return R.fail();
    }
    /**
     * 用户绑定社区、小区
     *
@@ -1623,9 +1652,9 @@
            if (e.getMessage().contains("union_phone_type")) {
                userDao.deleteStoreByPhoneAndStatus(storeVO.getPhone());
                roleDAO.deleteByRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
                throw new ServiceException("手机号已经存在");
                return R.fail("手机号已经存在");
            } else if (e.getMessage().contains("union_account_type")) {
                throw new ServiceException("账户已经存在");
                return R.fail("账户已经存在");
            }
        }
        return R.fail();