huanghongfa
2021-05-31 b241ce1c402ebec8b941283f6d20a86f5a22c44b
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1625,7 +1625,7 @@
    @Override
    public R getSysUserVOByPhone(String phone) {
        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone));
        SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType,1));
        if (ObjectUtils.isEmpty(sysUserDO)) {
            return R.fail("用户不存在");
        }
@@ -1802,4 +1802,34 @@
        userDao.updateUserArchives(userArchivesVO);
        return R.ok();
    }
    /**
     * 修改app用户密码
     * @param userInfoAppDTO    请求参数
     * @return  修改结果
     */
    @Override
    public R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO){
        if(userInfoAppDTO.getOldPassword().equals(userInfoAppDTO.getNewPassword())){
            return R.fail("新密码不可与原密码相同");
        }
        //查询用户信息
        SysUserDO userDO = userDao.selectById(userInfoAppDTO.getUserId());
        if (userDO == null) {
            return R.fail("未查询到用户信息");
        }
        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
        if (!passwordEncoder.matches(userInfoAppDTO.getOldPassword(),userDO.getPassword())) {
            return R.fail("原密码错误");
        }
        if(!userInfoAppDTO.getNewPassword().equals(userInfoAppDTO.getConfirmPassword())){
            return R.fail("两次输入的新密码不一致");
        }
        userDO.setPassword(passwordEncoder.encode(userInfoAppDTO.getNewPassword()));
        if (userDao.updateById(userDO) > 0) {
            return R.ok();
        } else {
            return R.fail();
        }
    }
}