|
|
@@ -1,8 +1,19 @@
|
|
|
package com.uas.platform.b2c.common.account.service.impl;
|
|
|
|
|
|
import com.uas.message.mail.service.MailService;
|
|
|
-import com.uas.platform.b2c.common.account.dao.*;
|
|
|
-import com.uas.platform.b2c.common.account.model.*;
|
|
|
+import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
|
|
|
+import com.uas.platform.b2c.common.account.dao.ResourceItemDao;
|
|
|
+import com.uas.platform.b2c.common.account.dao.RoleDao;
|
|
|
+import com.uas.platform.b2c.common.account.dao.UserCacheEnterpriseDao;
|
|
|
+import com.uas.platform.b2c.common.account.dao.UserDao;
|
|
|
+import com.uas.platform.b2c.common.account.dao.UserLoginTimeDao;
|
|
|
+import com.uas.platform.b2c.common.account.model.Enterprise;
|
|
|
+import com.uas.platform.b2c.common.account.model.ResourceItem;
|
|
|
+import com.uas.platform.b2c.common.account.model.Role;
|
|
|
+import com.uas.platform.b2c.common.account.model.User;
|
|
|
+import com.uas.platform.b2c.common.account.model.UserCacheEnterprise;
|
|
|
+import com.uas.platform.b2c.common.account.model.UserInfo;
|
|
|
+import com.uas.platform.b2c.common.account.model.UserLoginTime;
|
|
|
import com.uas.platform.b2c.common.account.service.UserService;
|
|
|
import com.uas.platform.b2c.core.config.MessageConf;
|
|
|
import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
@@ -30,7 +41,14 @@ import javax.persistence.criteria.Predicate;
|
|
|
import javax.persistence.criteria.Root;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.HashSet;
|
|
|
+import java.util.Iterator;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Set;
|
|
|
import java.util.concurrent.ExecutorService;
|
|
|
import java.util.concurrent.Executors;
|
|
|
|
|
|
@@ -393,10 +411,6 @@ public class UserServiceImpl implements UserService {
|
|
|
if (users.size() > 0) {
|
|
|
throw new IllegalOperatorException("电话号码重复,建议输入您自己的手机号");
|
|
|
}
|
|
|
- List<User> users2 = userDao.findUserByUserEmail(user.getUserEmail().trim());
|
|
|
- if (users2.size() > 0) {
|
|
|
- throw new IllegalOperatorException("邮箱地址重复,建议输入您自己的电子邮箱地址");
|
|
|
- }
|
|
|
UserView userView = new UserView();
|
|
|
userView.setVipName(user.getUserName());
|
|
|
userView.setSex(user.getUserSex());
|