From 14c16f352f2d8d083cd329da7fe2c065a4537c73 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 26 四月 2021 14:01:47 +0800
Subject: [PATCH] fix:修改商家添加功能逻辑代码
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 105 +++++++++++++++++++++-------------------------------
1 files changed, 42 insertions(+), 63 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 52df394..5ad2f6a 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
@@ -746,11 +746,11 @@
Long communityId = administratorsUserVO.getCommunityId();
//新增社区高级管理员角色
SysRoleDO sysRoleDO = new SysRoleDO();
- if(roleId.intValue() == 999999999){
+ if (roleId.intValue() == 999999999) {
sysRoleDO.setCommunityId(communityId);
sysRoleDO.setRoleName("超级管理员");
sysRoleDO.setRoleKey(Constants.ADMIN_SHOP_ROLE_KEY + communityId);
- }else{
+ } else {
sysRoleDO.setCommunityId(0L);
sysRoleDO.setRoleName(administratorsUserVO.getShopStoreName());
sysRoleDO.setRoleKey(Constants.SHOP_ROLE_KEY + administratorsUserVO.getShopStorePhone());
@@ -1574,46 +1574,34 @@
/**
* 新增SysUser
- * @param storeVO 请求参数
- * @return 新增结果
+ *
+ * @param storeVO 请求参数
+ * @return 新增结果
*/
@Override
- public R addSysUser(ShopStoreVO storeVO){
+ 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();
- //新角色设置所有权限
- MenuRoleVO menuRoleVO = new MenuRoleVO();
- menuRoleVO.setIsAll(1);
- menuRoleVO.setCommunityId(communityId);
- menuRoleVO.setRoleId(roleId);
- this.putMenuRole(menuRoleVO);
- }
+ Long communityId = 0L;
+ //新增社区高级管理员角色
+ SysRoleDO sysRoleDO = new SysRoleDO();
+ 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) {
+ return R.fail();
}
+ //新角色设置所有权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ menuRoleVO.setIsAll(1);
+ menuRoleVO.setCommunityId(communityId);
+ 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());
@@ -1623,32 +1611,21 @@
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());
+ if (sysUserDO.getUserId() != null) {
+ userDao.updateStoreByPhone(storeVO.getPhone(), sysUserDO.getUserId());
}
} catch (Exception e) {
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();
@@ -1656,14 +1633,15 @@
/**
* 修改SysUser用户信息
- * @param storeVO 请求参数
- * @return 修改结果
+ *
+ * @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){
+ 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());
@@ -1676,21 +1654,22 @@
/**
* 修改用户小程序首页活动提示
- * @param userEditTipsDTO 请求参数
- * @return 修改结果
+ *
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
*/
- public R editUserTips(SysUserEditTipsDTO userEditTipsDTO){
+ public R editUserTips(SysUserEditTipsDTO userEditTipsDTO) {
//查询用户信息
SysUserDO userDO = userDao.selectById(userEditTipsDTO.getUserId());
- if(userDO == null){
+ if (userDO == null) {
return R.fail("未查询到用户信息");
}
//修改用户信息
userDO.setIsTips(userEditTipsDTO.getIsTips());
userDao.updateById(userDO);
- if(userDao.updateById(userDO) > 0){
+ if (userDao.updateById(userDO) > 0) {
return R.ok();
- }else{
+ } else {
return R.fail();
}
}
--
Gitblit v1.7.1