Bladeren bron

处理erp一键注册的问题

liusw 8 jaren geleden
bovenliggende
commit
a4c7ad9320
1 gewijzigde bestanden met toevoegingen van 45 en 13 verwijderingen
  1. 45 13
      src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

+ 45 - 13
src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.sso.entity.UserSpaceView;
 import com.uas.sso.entity.UserSpaceDetail;
+import com.uas.sso.entity.UserView;
 import com.uas.sso.util.AccountUtils;
 import com.uas.platform.b2b.core.util.SearchKeyUtils;
 import com.uas.platform.b2b.dao.*;
@@ -678,6 +679,16 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		enterprise.setEnable(Constant.YES);
 		enterprise.setEnStatus((short) Status.UNAUDIT.value());// 审核状态设为未审核
 		enterprise.setEnSendStatus((short) Status.NOT_UPLOAD.value());// 上传状态设为未上传
+
+		//  在账户中心注册企业
+		try {
+			registerAccountEnterprise(enterprise);
+			logger.log("接口注册", "success", "一键注册企业同步到账户中心", enterprise.getUu());
+		} catch (Exception e) {
+			logger.log("接口注册", "faliure", "一键注册企业同步到账户中心", enterprise.getUu());
+			return null;
+		}
+
 		Enterprise newEnterprise = enterpriseDao.save(enterprise);// 保存enterprise
 		User user = null;
 		// 允许管理员账户已存在,添加对照关系,先根据手机号和邮箱判断是否是已存在的User
@@ -702,19 +713,19 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		}
 		user.addEnterprise(newEnterprise);// 添加userenterpris对应关系
 		User newUser = userDao.save(user);// 保存user
-		if (!ok) {
-			if (StringUtils.isEmpty(enterprise.getEnAdminPassword())) {
-				enterprise.setEnAdminPassword("111111");
-			}
-			newUser.setUserPwd(Md5Utils.encode(enterprise.getEnAdminPassword(), newUser.getUserUU()));
-			user = userDao.save(newUser);
-			try {
-				userService.postToAccountCenter(user);
-				logger.log("接口注册", "success", "一键注册用户同步到账户中心", user.getUserUU());
-			} catch (Exception e) {
-				logger.log("接口注册", "faliure", "一键注册用户同步到账户中心", user.getUserUU());
-			}
-		}
+//		if (!ok) {
+//			if (StringUtils.isEmpty(enterprise.getEnAdminPassword())) {
+//				enterprise.setEnAdminPassword("111111");
+//			}
+//			newUser.setUserPwd(Md5Utils.encode(enterprise.getEnAdminPassword(), newUser.getUserUU()));
+//			user = userDao.save(newUser);
+//			try {
+//				userService.postToAccountCenter(user);
+//				logger.log("接口注册", "success", "一键注册用户同步到账户中心", user.getUserUU());
+//			} catch (Exception e) {
+//				logger.log("接口注册", "faliure", "一键注册用户同步到账户中心", user.getUserUU());
+//			}
+//		}
 		newEnterprise.setEnAdminuu(newUser.getUserUU());// 设置管理员UU号
 		newEnterprise.setEnIsErp(Constant.YES);
 		newEnterprise = enterpriseDao.save(newEnterprise);// 再次保存enterprise
@@ -723,6 +734,27 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		return newEnterprise;
 	}
 
+	private void registerAccountEnterprise(Enterprise enterprise) throws Exception {
+		UserSpaceView userSpaceView = new UserSpaceView();
+		userSpaceView.setSpaceName(enterprise.getEnName());
+		userSpaceView.setBusinessCode(enterprise.getEnBussinessCode());
+		userSpaceView.setBusinessCodeImage(enterprise.getBusinesscodeimg());
+		userSpaceView.setCorporation(enterprise.getEnCorporation());
+		userSpaceView.setRegAddress(enterprise.getEnAddress());
+		userSpaceView.setArea(enterprise.getEnArea());
+		userSpaceView.setProfession(enterprise.getProfession());
+		userSpaceView.setAccessSecret(enterprise.getAccessSecret());
+		UserView admin = new UserView();
+		admin.setEmail(enterprise.getEnAdminEmail());
+		admin.setMobile(enterprise.getEnAdminTel());
+		admin.setPassword(enterprise.getEnAdminPassword());
+		admin.setVipName(enterprise.getEnAdminName());
+		userSpaceView = AccountUtils.register(userSpaceView, admin);
+		enterprise.setUu(userSpaceView.getSpaceUU());
+		enterprise.setEnAdminuu(userSpaceView.getAdmin().getUserUU());
+		enterprise.setEnAdminPassword(userSpaceView.getAdmin().getPassword());
+	}
+
 	@Override
 	public Set<Enterprise> findByNameKey(String name) {
 		Set<Enterprise> enterprises = new HashSet<Enterprise>();