From 1f9889666aef211599087ce6dcc4cd6cff3496ad Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期四, 22 四月 2021 13:38:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 336c8cc..dfddfd2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/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("密码修改失败");
+ }
}
--
Gitblit v1.7.1