sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

增加电商带吗

Browse Source
This commit is contained in:
Loki
2022-04-21 18:09:49 +08:00
parent 1971f3031c
commit 01ab4d2b4f
910 changed files with 68324 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
+30 -30
View File
@@ -46,7 +46,7 @@ public class AdminUserServiceImpl implements AdminUserService {
private String userInitPassword;
@Resource
private AdminUserMapper userMapper;
private AdminUserMapper adminUserMapper;
@Resource
private DeptService deptService;
@@ -67,7 +67,7 @@ public class AdminUserServiceImpl implements AdminUserService {
public Long createUser(UserCreateReqVO reqVO) {
// 校验账户配合
tenantService.handleTenantInfo(tenant -> {
long count = userMapper.selectCount();
long count = adminUserMapper.selectCount();
if (count >= tenant.getAccountCount()) {
throw exception(USER_COUNT_MAX, tenant.getAccountCount());
}
@@ -79,7 +79,7 @@ public class AdminUserServiceImpl implements AdminUserService {
AdminUserDO user = UserConvert.INSTANCE.convert(reqVO);
user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启
user.setPassword(passwordEncoder.encode(reqVO.getPassword())); // 加密密码
userMapper.insert(user);
adminUserMapper.insert(user);
return user.getId();
}
@@ -90,12 +90,12 @@ public class AdminUserServiceImpl implements AdminUserService {
reqVO.getDeptId(), reqVO.getPostIds());
// 更新用户
AdminUserDO updateObj = UserConvert.INSTANCE.convert(reqVO);
userMapper.updateById(updateObj);
adminUserMapper.updateById(updateObj);
}
@Override
public void updateUserLogin(Long id, String loginIp) {
userMapper.updateById(new AdminUserDO().setId(id).setLoginIp(loginIp).setLoginDate(new Date()));
adminUserMapper.updateById(new AdminUserDO().setId(id).setLoginIp(loginIp).setLoginDate(new Date()));
}
@Override
@@ -105,7 +105,7 @@ public class AdminUserServiceImpl implements AdminUserService {
this.checkEmailUnique(id, reqVO.getEmail());
this.checkMobileUnique(id, reqVO.getMobile());
// 执行更新
userMapper.updateById(UserConvert.INSTANCE.convert(reqVO).setId(id));
adminUserMapper.updateById(UserConvert.INSTANCE.convert(reqVO).setId(id));
}
@Override
@@ -115,7 +115,7 @@ public class AdminUserServiceImpl implements AdminUserService {
// 执行更新
AdminUserDO updateObj = new AdminUserDO().setId(id);
updateObj.setPassword(passwordEncoder.encode(reqVO.getNewPassword())); // 加密密码
userMapper.updateById(updateObj);
adminUserMapper.updateById(updateObj);
}
@Override
@@ -127,7 +127,7 @@ public class AdminUserServiceImpl implements AdminUserService {
AdminUserDO sysUserDO = new AdminUserDO();
sysUserDO.setId(id);
sysUserDO.setAvatar(avatar);
userMapper.updateById(sysUserDO);
adminUserMapper.updateById(sysUserDO);
return avatar;
}
@@ -139,7 +139,7 @@ public class AdminUserServiceImpl implements AdminUserService {
AdminUserDO updateObj = new AdminUserDO();
updateObj.setId(id);
updateObj.setPassword(passwordEncoder.encode(password)); // 加密密码
userMapper.updateById(updateObj);
adminUserMapper.updateById(updateObj);
}
@Override
@@ -150,7 +150,7 @@ public class AdminUserServiceImpl implements AdminUserService {
AdminUserDO updateObj = new AdminUserDO();
updateObj.setId(id);
updateObj.setStatus(status);
userMapper.updateById(updateObj);
adminUserMapper.updateById(updateObj);
}
@Override
@@ -158,24 +158,24 @@ public class AdminUserServiceImpl implements AdminUserService {
// 校验用户存在
this.checkUserExists(id);
// 删除用户
userMapper.deleteById(id);
adminUserMapper.deleteById(id);
// 删除用户关联数据
permissionService.processUserDeleted(id);
}
@Override
public AdminUserDO getUserByUsername(String username) {
return userMapper.selectByUsername(username);
return adminUserMapper.selectByUsername(username);
}
@Override
public PageResult<AdminUserDO> getUserPage(UserPageReqVO reqVO) {
return userMapper.selectPage(reqVO, this.getDeptCondition(reqVO.getDeptId()));
return adminUserMapper.selectPage(reqVO, this.getDeptCondition(reqVO.getDeptId()));
}
@Override
public AdminUserDO getUser(Long id) {
return userMapper.selectById(id);
return adminUserMapper.selectById(id);
}
@Override
@@ -183,7 +183,7 @@ public class AdminUserServiceImpl implements AdminUserService {
if (CollUtil.isEmpty(deptIds)) {
return Collections.emptyList();
}
return userMapper.selectListByDeptIds(deptIds);
return adminUserMapper.selectListByDeptIds(deptIds);
}
@Override
@@ -193,7 +193,7 @@ public class AdminUserServiceImpl implements AdminUserService {
}
// 过滤不符合条件的
// TODO 芋艿：暂时只能内存过滤。解决方案：1、新建一个关联表；2、基于 where + 函数；3、json 字段，适合 mysql 8+ 版本
List<AdminUserDO> users = userMapper.selectList();
List<AdminUserDO> users = adminUserMapper.selectList();
users.removeIf(user -> !CollUtil.containsAny(user.getPostIds(), postIds));
return users;
}
@@ -203,7 +203,7 @@ public class AdminUserServiceImpl implements AdminUserService {
if (CollUtil.isEmpty(ids)) {
return Collections.emptyList();
}
return userMapper.selectBatchIds(ids);
return adminUserMapper.selectBatchIds(ids);
}
@Override
@@ -212,7 +212,7 @@ public class AdminUserServiceImpl implements AdminUserService {
return;
}
// 获得岗位信息
List<AdminUserDO> users = userMapper.selectBatchIds(ids);
List<AdminUserDO> users = adminUserMapper.selectBatchIds(ids);
Map<Long, AdminUserDO> userMap = CollectionUtils.convertMap(users, AdminUserDO::getId);
// 校验
ids.forEach(id -> {
@@ -228,17 +228,17 @@ public class AdminUserServiceImpl implements AdminUserService {
@Override
public List<AdminUserDO> getUsers(UserExportReqVO reqVO) {
return userMapper.selectList(reqVO, this.getDeptCondition(reqVO.getDeptId()));
return adminUserMapper.selectList(reqVO, this.getDeptCondition(reqVO.getDeptId()));
}
@Override
public List<AdminUserDO> getUsersByNickname(String nickname) {
return userMapper.selectListByNickname(nickname);
return adminUserMapper.selectListByNickname(nickname);
}
@Override
public List<AdminUserDO> getUsersByUsername(String username) {
return userMapper.selectListByUsername(username);
return adminUserMapper.selectListByUsername(username);
}
/**
@@ -278,7 +278,7 @@ public class AdminUserServiceImpl implements AdminUserService {
if (id == null) {
return;
}
AdminUserDO user = userMapper.selectById(id);
AdminUserDO user = adminUserMapper.selectById(id);
if (user == null) {
throw exception(USER_NOT_EXISTS);
}
@@ -289,7 +289,7 @@ public class AdminUserServiceImpl implements AdminUserService {
if (StrUtil.isBlank(username)) {
return;
}
AdminUserDO user = userMapper.selectByUsername(username);
AdminUserDO user = adminUserMapper.selectByUsername(username);
if (user == null) {
return;
}
@@ -307,7 +307,7 @@ public class AdminUserServiceImpl implements AdminUserService {
if (StrUtil.isBlank(email)) {
return;
}
AdminUserDO user = userMapper.selectByEmail(email);
AdminUserDO user = adminUserMapper.selectByEmail(email);
if (user == null) {
return;
}
@@ -325,7 +325,7 @@ public class AdminUserServiceImpl implements AdminUserService {
if (StrUtil.isBlank(mobile)) {
return;
}
AdminUserDO user = userMapper.selectByMobile(mobile);
AdminUserDO user = adminUserMapper.selectByMobile(mobile);
if (user == null) {
return;
}
@@ -346,7 +346,7 @@ public class AdminUserServiceImpl implements AdminUserService {
*/
@VisibleForTesting
public void checkOldPassword(Long id, String oldPassword) {
AdminUserDO user = userMapper.selectById(id);
AdminUserDO user = adminUserMapper.selectById(id);
if (user == null) {
throw exception(USER_NOT_EXISTS);
}
@@ -373,9 +373,9 @@ public class AdminUserServiceImpl implements AdminUserService {
return;
}
// 判断如果不存在，在进行插入
AdminUserDO existUser = userMapper.selectByUsername(importUser.getUsername());
AdminUserDO existUser = adminUserMapper.selectByUsername(importUser.getUsername());
if (existUser == null) {
userMapper.insert(UserConvert.INSTANCE.convert(importUser)
adminUserMapper.insert(UserConvert.INSTANCE.convert(importUser)
.setPassword(passwordEncoder.encode(userInitPassword))); // 设置默认密码
respVO.getCreateUsernames().add(importUser.getUsername());
return;
@@ -387,7 +387,7 @@ public class AdminUserServiceImpl implements AdminUserService {
}
AdminUserDO updateUser = UserConvert.INSTANCE.convert(importUser);
updateUser.setId(existUser.getId());
userMapper.updateById(updateUser);
adminUserMapper.updateById(updateUser);
respVO.getUpdateUsernames().add(importUser.getUsername());
});
return respVO;
@@ -395,7 +395,7 @@ public class AdminUserServiceImpl implements AdminUserService {
@Override
public List<AdminUserDO> getUsersByStatus(Integer status) {
return userMapper.selectListByStatus(status);
return adminUserMapper.selectListByStatus(status);
}
}
yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/user/UserServiceImplTest.java
+33 -33
View File
@@ -53,7 +53,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
private AdminUserServiceImpl userService;
@Resource
private AdminUserMapper userMapper;
private AdminUserMapper adminUserMapper;
@MockBean
private DeptService deptService;
@@ -100,7 +100,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 调用
Long userId = userService.createUser(reqVO);
// 断言
AdminUserDO user = userMapper.selectById(userId);
AdminUserDO user = adminUserMapper.selectById(userId);
assertPojoEquals(reqVO, user, "password");
assertEquals("yudaoyuanma", user.getPassword());
assertEquals(CommonStatusEnum.ENABLE.getStatus(), user.getStatus());
@@ -125,7 +125,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testUpdateUser_success() {
// mock 数据
AdminUserDO dbUser = randomAdminUserDO();
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 准备参数
UserUpdateReqVO reqVO = randomPojo(UserUpdateReqVO.class, o -> {
o.setId(dbUser.getId());
@@ -149,7 +149,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 调用
userService.updateUser(reqVO);
// 断言
AdminUserDO user = userMapper.selectById(reqVO.getId());
AdminUserDO user = adminUserMapper.selectById(reqVO.getId());
assertPojoEquals(reqVO, user);
}
@@ -157,7 +157,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testUpdateUserProfile_success() {
// mock 数据
AdminUserDO dbUser = randomAdminUserDO();
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 准备参数
Long userId = dbUser.getId();
UserProfileUpdateReqVO reqVO = randomPojo(UserProfileUpdateReqVO.class, o -> {
@@ -168,7 +168,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 调用
userService.updateUserProfile(userId, reqVO);
// 断言
AdminUserDO user = userMapper.selectById(userId);
AdminUserDO user = adminUserMapper.selectById(userId);
assertPojoEquals(reqVO, user);
}
@@ -176,7 +176,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testUpdateUserPassword_success() {
// mock 数据
AdminUserDO dbUser = randomAdminUserDO(o -> o.setPassword("encode:tudou"));
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 准备参数
Long userId = dbUser.getId();
UserProfileUpdatePasswordReqVO reqVO = randomPojo(UserProfileUpdatePasswordReqVO.class, o -> {
@@ -191,7 +191,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 调用
userService.updateUserPassword(userId, reqVO);
// 断言
AdminUserDO user = userMapper.selectById(userId);
AdminUserDO user = adminUserMapper.selectById(userId);
assertEquals("encode:yuanma", user.getPassword());
}
@@ -199,7 +199,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testUpdateUserAvatar_success() throws Exception {
// mock 数据
AdminUserDO dbUser = randomAdminUserDO();
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 准备参数
Long userId = dbUser.getId();
byte[] avatarFileBytes = randomBytes(10);
@@ -211,7 +211,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 调用
userService.updateUserAvatar(userId, avatarFile);
// 断言
AdminUserDO user = userMapper.selectById(userId);
AdminUserDO user = adminUserMapper.selectById(userId);
assertEquals(avatar, user.getAvatar());
}
@@ -219,7 +219,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testUpdateUserPassword02_success() {
// mock 数据
AdminUserDO dbUser = randomAdminUserDO();
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 准备参数
Long userId = dbUser.getId();
String password = "yudao";
@@ -230,7 +230,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 调用
userService.updateUserPassword(userId, password);
// 断言
AdminUserDO user = userMapper.selectById(userId);
AdminUserDO user = adminUserMapper.selectById(userId);
assertEquals("encode:" + password, user.getPassword());
}
@@ -238,7 +238,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testUpdateUserStatus() {
// mock 数据
AdminUserDO dbUser = randomAdminUserDO();
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 准备参数
Long userId = dbUser.getId();
Integer status = randomCommonStatus();
@@ -246,7 +246,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 调用
userService.updateUserStatus(userId, status);
// 断言
AdminUserDO user = userMapper.selectById(userId);
AdminUserDO user = adminUserMapper.selectById(userId);
assertEquals(status, user.getStatus());
}
@@ -254,14 +254,14 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testDeleteUser_success(){
// mock 数据
AdminUserDO dbUser = randomAdminUserDO();
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 准备参数
Long userId = dbUser.getId();
// 调用数据
userService.deleteUser(userId);
// 校验结果
assertNull(userMapper.selectById(userId));
assertNull(adminUserMapper.selectById(userId));
// 校验调用次数
verify(permissionService, times(1)).processUserDeleted(eq(userId));
}
@@ -325,17 +325,17 @@ public class UserServiceImplTest extends BaseDbUnitTest {
o.setCreateTime(buildTime(2020, 12, 12));
o.setDeptId(2L);
});
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 测试 username 不匹配
userMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setUsername("dou")));
adminUserMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setUsername("dou")));
// 测试 mobile 不匹配
userMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setMobile("18818260888")));
adminUserMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setMobile("18818260888")));
// 测试 status 不匹配
userMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
adminUserMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));
// 测试 createTime 不匹配
userMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setCreateTime(buildTime(2020, 11, 11))));
adminUserMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setCreateTime(buildTime(2020, 11, 11))));
// 测试 dept 不匹配
userMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setDeptId(0L)));
adminUserMapper.insert(ObjectUtils.cloneIgnoreId(dbUser, o -> o.setDeptId(0L)));
return dbUser;
}
@@ -382,7 +382,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
UserImportRespVO respVO = userService.importUsers(newArrayList(importUser), true);
// 断言
assertEquals(1, respVO.getCreateUsernames().size());
AdminUserDO user = userMapper.selectByUsername(respVO.getCreateUsernames().get(0));
AdminUserDO user = adminUserMapper.selectByUsername(respVO.getCreateUsernames().get(0));
assertPojoEquals(importUser, user);
assertEquals("java", user.getPassword());
assertEquals(0, respVO.getUpdateUsernames().size());
@@ -396,7 +396,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testImportUsers_03() {
// mock 数据
AdminUserDO dbUser = randomAdminUserDO();
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 准备参数
UserImportExcelVO importUser = randomPojo(UserImportExcelVO.class, o -> {
o.setStatus(randomEle(CommonStatusEnum.values()).getStatus()); // 保证 status 的范围
@@ -426,7 +426,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testImportUsers_04() {
// mock 数据
AdminUserDO dbUser = randomAdminUserDO();
userMapper.insert(dbUser);
adminUserMapper.insert(dbUser);
// 准备参数
UserImportExcelVO importUser = randomPojo(UserImportExcelVO.class, o -> {
o.setStatus(randomEle(CommonStatusEnum.values()).getStatus()); // 保证 status 的范围
@@ -445,7 +445,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 断言
assertEquals(0, respVO.getCreateUsernames().size());
assertEquals(1, respVO.getUpdateUsernames().size());
AdminUserDO user = userMapper.selectByUsername(respVO.getUpdateUsernames().get(0));
AdminUserDO user = adminUserMapper.selectByUsername(respVO.getUpdateUsernames().get(0));
assertPojoEquals(importUser, user);
assertEquals(0, respVO.getFailureUsernames().size());
}
@@ -460,7 +460,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 准备参数
String username = randomString();
// mock 数据
userMapper.insert(randomAdminUserDO(o -> o.setUsername(username)));
adminUserMapper.insert(randomAdminUserDO(o -> o.setUsername(username)));
// 调用，校验异常
assertServiceException(() -> userService.checkUsernameUnique(null, username),
@@ -473,7 +473,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
Long id = randomLongId();
String username = randomString();
// mock 数据
userMapper.insert(randomAdminUserDO(o -> o.setUsername(username)));
adminUserMapper.insert(randomAdminUserDO(o -> o.setUsername(username)));
// 调用，校验异常
assertServiceException(() -> userService.checkUsernameUnique(id, username),
@@ -485,7 +485,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 准备参数
String email = randomString();
// mock 数据
userMapper.insert(randomAdminUserDO(o -> o.setEmail(email)));
adminUserMapper.insert(randomAdminUserDO(o -> o.setEmail(email)));
// 调用，校验异常
assertServiceException(() -> userService.checkEmailUnique(null, email),
@@ -498,7 +498,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
Long id = randomLongId();
String email = randomString();
// mock 数据
userMapper.insert(randomAdminUserDO(o -> o.setEmail(email)));
adminUserMapper.insert(randomAdminUserDO(o -> o.setEmail(email)));
// 调用，校验异常
assertServiceException(() -> userService.checkEmailUnique(id, email),
@@ -510,7 +510,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
// 准备参数
String mobile = randomString();
// mock 数据
userMapper.insert(randomAdminUserDO(o -> o.setMobile(mobile)));
adminUserMapper.insert(randomAdminUserDO(o -> o.setMobile(mobile)));
// 调用，校验异常
assertServiceException(() -> userService.checkMobileUnique(null, mobile),
@@ -523,7 +523,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
Long id = randomLongId();
String mobile = randomString();
// mock 数据
userMapper.insert(randomAdminUserDO(o -> o.setMobile(mobile)));
adminUserMapper.insert(randomAdminUserDO(o -> o.setMobile(mobile)));
// 调用，校验异常
assertServiceException(() -> userService.checkMobileUnique(id, mobile),
@@ -540,7 +540,7 @@ public class UserServiceImplTest extends BaseDbUnitTest {
public void testCheckOldPassword_passwordFailed() {
// mock 数据
AdminUserDO user = randomAdminUserDO();
userMapper.insert(user);
adminUserMapper.insert(user);
// 准备参数
Long id = user.getId();
String oldPassword = user.getPassword();