Merge remote-tracking branch 'origin/master'

CeDo

2021-04-22 dabcb942ab62fb522f5932a665fa3e1952702d00

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

@@ -1574,6 +1574,12 @@
        return R.ok(sysUserVO);
    }

    /**
     * 新增SysUser
     * @param storeVO   请求参数
     * @return  新增结果
     */
    @Override
    public R addSysUser(ShopStoreVO storeVO){

        SysUserDO sysUserDO = new SysUserDO();
@@ -1611,7 +1617,6 @@
            return R.fail("角色不存在");
        }
        String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
        storeVO.setStorePassword(encode);
        BeanUtils.copyProperties(storeVO, sysUserDO);
        sysUserDO.setAccount(storeVO.getStoreAccount());
        sysUserDO.setType(5);
@@ -1619,6 +1624,7 @@
        sysUserDO.setStatus(1);
        sysUserDO.setPhone(storeVO.getPhone());
        sysUserDO.setName(storeVO.getContacts());
        sysUserDO.setPassword(encode);
        int insert = 0;
        try {
            insert = userDao.insert(sysUserDO);
@@ -1649,4 +1655,24 @@
        }
        return R.fail();
    }

    /**
     * 修改SysUser用户信息
     * @param storeVO   请求参数
     * @return  修改结果
     */
    @Override
    public R editSysUser(ShopStoreVO storeVO){
        SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone,storeVO.getPhone())
                .eq(SysUserDO::getType,5));
        if(sysUserDO1 == null){
            return R.fail("未查询到后台管理用户！");
        }
        String encode = new BCryptPasswordEncoder().encode(storeVO.getStorePassword());
        sysUserDO1.setPassword(encode);
        if (userDao.updateById(sysUserDO1) > 0) {
            return R.ok();
        }
        return R.fail("密码修改失败");
    }
}