From 2dbe2c8b830a3b006b1536c7dac48b5f8c24e00d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 28 四月 2025 16:53:07 +0800
Subject: [PATCH] #wms端生成任务优化
---
rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java
index 4f0e082..c5c6ff7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.domain.BusinessRes;
+import com.vincent.rsf.server.common.exception.BusinessException;
+import com.vincent.rsf.server.common.service.EmailService;
import com.vincent.rsf.server.system.controller.param.TenantInitParam;
import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.enums.StatusType;
@@ -32,16 +35,30 @@
private UserRoleService userRoleService;
@Autowired
private RoleMenuService roleMenuService;
+ @Autowired
+ private EmailService emailService;
@Override
@Transactional
- public Boolean initTenant(TenantInitParam param) {
+ public Long initTenant(TenantInitParam param) {
// valid ----------------------------
if (null == param) {
- return false;
+ return null;
}
if (Cools.isEmpty(param.getName(), param.getFlag(), param.getUsername(), param.getPassword())) {
- return false;
+ return null;
+ }
+
+ if (null != userService.getByUsername(param.getUsername(), null)) {
+ throw new BusinessException(BusinessRes.USERNAME_EXIST);
+ }
+ if (!Cools.isEmpty(param.getEmail())) {
+ if (!emailService.isValid(param.getEmail())) {
+ throw new CoolException("Please enter a valid email address");
+ }
+ if (null != userService.getByEmail(param.getEmail(), null)) {
+ throw new CoolException("the email already exist");
+ }
}
if (0 < this.count(new LambdaQueryWrapper<Tenant>().eq(Tenant::getName, param.getName()))) {
@@ -49,15 +66,6 @@
}
if (0 < this.count(new LambdaQueryWrapper<Tenant>().eq(Tenant::getFlag, param.getFlag()))) {
throw new CoolException("tenant flag already exist");
- }
-
- if (null != userService.getByUsername(param.getUsername(), null)) {
- throw new CoolException("the username already exist");
- }
- if (!Cools.isEmpty(param.getEmail())) {
- if (null != userService.getByEmail(param.getEmail(), null)) {
- throw new CoolException("the email already exist");
- }
}
Date now = new Date();
@@ -125,7 +133,7 @@
}
}
- return true;
+ return tenant.getId();
}
}
--
Gitblit v1.9.1