feat: 用户，企业同步规范调整

src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -49,7 +49,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	@Autowired
     private InvitationRecordDao recordDao;
 
-	private final static CommBufferedLogger logger = BufferedLoggerManager.getLogger(CommBufferedLogger.class);
+	private final static CommBufferedLogger LOGGER = BufferedLoggerManager.getLogger(CommBufferedLogger.class);
 
 	private final static Logger INFO_LOG = Logger.getLogger(EnterpriseServiceImpl.class);
 
@@ -73,11 +73,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		enterprise.setEnArea(detail.getArea());
 		enterprise.setEnBussinessCode(detail.getBusinessCode());
 		enterprise.setEnCorporation(detail.getCorporation());
-		if(null != detail.getRegisterDate()) {
-			enterprise.setEnDate(new Date(detail.getRegisterDate()));
-		} else {
-			enterprise.setEnDate(new Date());
-		}
+        enterprise.setEnDate(null != detail.getRegisterDate() ? new Date(detail.getRegisterDate()) : new Date());
 		enterprise.setEnName(detail.getSpaceName());
 		enterprise.setLogUrl(detail.getLogoImage());
 		enterprise.setProfession(detail.getProfession());
@@ -94,26 +90,26 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         User user = userDao.findOne(enterprise.getEnAdminuu());
         INFO_LOG.info("把管理员添加进企业: user-> " + JSONObject.toJSON(user));
         // 先进行管理员信息查找，如果不存在，等待用户信息先存储
-        synchronized (user) {
-            if (null == user) {
-                try {
-                    Thread.sleep(2000);
-                    user = userDao.findOne(enterprise.getEnAdminuu());
-                    if (null == user) {
-                        user = new User(detail.getAdmin());
-                    }
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
+        if (null == user) {
+            try {
+                Thread.sleep(2000);
+                user = userDao.findOne(enterprise.getEnAdminuu());
+                if (null == user) {
+                    user = new User(detail.getAdmin());
                 }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
             }
         }
-		user.addEnterprise(enterprise);
-		// 将用户设置为管理员，只对用户的当前企业的角色进行修改
+        if (user != null) {
+            user.addEnterprise(enterprise);
+        }
+        // 将用户设置为管理员，只对用户的当前企业的角色进行修改
         setUserRole(user, enterprise);
 		if (isNew) {
 			final Long enUU = enterprise.getUu();
             enterpriseDao.callInitProcedure(enUU);
-            logger.log("企业信息", "企业初始化", "新注册企业初始化资料", enUU);
+            LOGGER.log("企业信息", "企业初始化", "新注册企业初始化资料", enUU);
 		}
 		return enterprise;
 	}
@@ -137,7 +133,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     @Override
     public User setUserRole(User user, Enterprise enterprise) {
         // 新用户注册企业时为空
-        Set<Role> existRoles = new HashSet<Role>();
+        Set<Role> existRoles = new HashSet<>();
         // 老用户注册新企业
         if (!CollectionUtils.isEmpty(user.getRoles())) {
             existRoles = user.getRoles();
@@ -209,7 +205,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
                 record.setVendusertel(enterpriseInfo.getEnTel());
                 record.setVendusername(enterpriseInfo.getContactMan());
                 User admin = userDao.findOne(enterpriseInfo.getEnAdminuu());
-                Date inviteDate = null != null ? new Date(enterpriseInfo.getInviteTime()) : new Date(System.currentTimeMillis());
+                Date inviteDate = new Date(System.currentTimeMillis());
                 record.setDate(inviteDate);
                 record.setVenduu(enterpriseInfo.getUu());
                 record.setSource(enterpriseInfo.getInviteSource() != null ? enterpriseInfo.getInviteSource() : "B2B");
@@ -223,7 +219,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
                 String inviteInfo = "企业名称： " + enterpriseInfo.getEnName() + ";"
                         + "邀请企业： " + inviteEnterprise.getEnName() + "(" + inviteEnterprise.getUu() + ");"
                         + "邀请人: " + inviteUser.getUserName() + "(" + inviteUser.getUserUU() + ")";
-                logger.log("添加合作伙伴", "企业注册添加合作伙伴", inviteInfo , enterpriseInfo.getUu());
+                LOGGER.log("添加合作伙伴", "企业注册添加合作伙伴", inviteInfo , enterpriseInfo.getUu());
             }
         }
     }

src/main/java/com/uas/platform/b2b/v2/service/impl/UserServiceImpl.java

@@ -43,7 +43,7 @@ public class UserServiceImpl implements UserService {
 
 	private final static Logger LOGGER = Logger.getLogger(UserServiceImpl.class);
 	
-	static final String defaultPassword = "111111";
+	private static final String defaultPassword = "111111";
 
 	@Override
 	public User save(UserView user) {
@@ -116,9 +116,9 @@ public class UserServiceImpl implements UserService {
 		Enterprise enterprise = enterpriseDao.findOne(spaceUU);
 		if (user == null) {
 			user = new User(userView);
-			user.setEnterprises(new HashSet<Enterprise>());
+			user.setEnterprises(new HashSet<>());
 		}
-		if (user == null || enterprise == null) {
+		if (enterprise == null) {
 			return;
 		}
 		List<Role> roles = roleDao.findByEnUUAndDesc(enterprise.getUu(), "普通用户");