From 634c8b22ca833ce38afa7a100c00978b9fce43c2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 27 九月 2021 16:56:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 f4adeda..d619344 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
@@ -3,6 +3,7 @@
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -1068,6 +1069,8 @@
throw new ServiceException("手机号已经存在");
} else if (e.getMessage().contains("union_account_type")) {
throw new ServiceException("账户已经存在");
+ }else if(e.getMessage().contains("23000")){
+ throw new ServiceException("手机号已存在");
}
}
@@ -1090,6 +1093,8 @@
throw new ServiceException("手机号已经存在");
} else if (e.getMessage().contains("union_account_type")) {
throw new ServiceException("账户已经存在");
+ }else if(e.getMessage().contains("23000")){
+ throw new ServiceException("手机号已存在");
}
}
@@ -2163,7 +2168,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO) {
-
+ //todo 网格
SysRoleDO gridMemberDefaultRole = roleDAO.selectOne(
new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, Constants.GRID_DEFAULT_ROLE_KEY));
if (gridMemberDefaultRole == null) {
@@ -2565,12 +2570,12 @@
}
@Override
- public R resetPasswordPatch(Long[] userId) {
+ public R resetPasswordPatch(Long[] userId,String password) {
if(userId!=null){
for(Long user:userId){
SysUserDO sysUserDO = new SysUserDO();
sysUserDO.setUserId(user);
- String encode = new BCryptPasswordEncoder().encode("admin123456");
+ String encode = new BCryptPasswordEncoder().encode(password);
sysUserDO.setPassword(encode);
userDao.updateById(sysUserDO);
}
@@ -2586,11 +2591,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R addConvenientMerchantUser(ConvenientMerchantDTO convenientMerchantDTO) {
+ // todo 便民
+ log.error("catTimeStamp进入addConvenientMerchantUser", Instant.now().toEpochMilli());
SysUserDO sysUserDO = new SysUserDO();
Long communityId = 0L;
// 新增社区高级管理员角色
SysRoleDO sysRoleDO = new SysRoleDO();
- sysRoleDO.setCommunityId(0L);
+ sysRoleDO.setCommunityId(communityId);
sysRoleDO.setRoleName(convenientMerchantDTO.getName());
sysRoleDO.setRoleKey(Constants.CONVENIENT_MERCHANT_ROLE_KEY + convenientMerchantDTO.getAccount());
sysRoleDO.setRoleSort(0);
@@ -2605,15 +2612,18 @@
if (e.getMessage().contains("unique_role_name_community_id")) {
return R.fail("商家名称已被占用");
} else {
- return R.fail("建立商家角色失败");
+ return R.fail("建立商家角色失败，商家名称可能已被占用！");
}
}
+ log.error("catTimeStamp-SysRoleDO创建完成", Instant.now().toEpochMilli());
// 新角色设置所有权限
MenuRoleVO menuRoleVO = new MenuRoleVO();
menuRoleVO.setIsAll(1);
menuRoleVO.setCommunityId(communityId);
menuRoleVO.setRoleId(sysRoleDO.getRoleId());
this.putMenuRole(menuRoleVO);
+
+ log.error("catTimeStamp-MenuRoleVO创建完成", Instant.now().toEpochMilli());
// sys_user 表
String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
@@ -2627,6 +2637,7 @@
sysUserDO.setPassword(encode);
try {
userDao.insert(sysUserDO);
+ log.error("catTimeStamp-sysUserDO创建完成", Instant.now().toEpochMilli());
return R.ok(sysUserDO.getUserId());
} catch (Exception e) {
e.printStackTrace();
@@ -2669,7 +2680,7 @@
@Override
public R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
- userDao.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO.getType(), disableOrEnableConvenientMerchantDTO.getIds());
+ userDao.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO.getType(), disableOrEnableConvenientMerchantDTO.getUserIds());
return R.ok();
}
}
--
Gitblit v1.7.1