更新

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzsBaseIndividuality.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("tzs_base_individuality")
+@TableName("tz_base_individuality")
 public class TzsBaseIndividuality extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/entity/TzsBaseInstitution.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("tzs_base_institution")
+@TableName("tz_base_institution")
 public class TzsBaseInstitution extends BaseEntity {
 
     private static final long serialVersionUID = 1L;

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsBaseInstitutionServiceImpl.java

@@ -67,9 +67,9 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
     }
 
 
-
     @Transactional
-    public void  register(BaseInstitutionRegisterDto dto){
+    public void register(BaseInstitutionRegisterDto dto) {
+        try {
             dto.setUnitCodeType("1060");
             dto.setUnitCodeTypeName("营业执照");
             String unitType = StringUtils.join(dto.getUnitTypeList(), ",");
@@ -92,10 +92,16 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
                 throw new BadRequest("单位注册失败");
             }
             CompanyModel company = companyResult.getResult();
+            dto.setAmosCompanySeq(company.getSequenceNbr().toString());
             AccountDto accountDto = new AccountDto();
             accountDto.setCompanyId(company.getSequenceNbr());
             accountDto.setUnitTypeCode(unitTypeCode);
-        regUnitInfoService.createUser(accountDto);
+            accountDto.setAdminTel(dto.getAdminTel());
+            accountDto.setPwd(dto.getAdminLoginPwd());
+            accountDto.setLoginName(dto.getAdminLoginName());
+            accountDto.setAdminUserName(dto.getAdminName());
+            AgencyUserModel user = regUnitInfoService.createUser(accountDto);
+            dto.setAdminUserId(user.getUserId());
             RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
             BeanUtils.copyProperties(dto, regUnitInfoDto);
             TzBaseEnterpriseInfo baseEnterpriseInfo = regUnitInfoService.createBaseEnterpriseInfo(regUnitInfoDto);
@@ -114,6 +120,29 @@ public class TzsBaseInstitutionServiceImpl extends BaseService<TzsBaseInstitutio
             if (!baseUnitLicences.isEmpty()) {
                 baseUnitLicenceService.saveOrUpdateBatch(baseUnitLicences);
             }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            try {
+                // 失败后回滚：删除已经创建的企业信息
+                if (StringUtils.isNotEmpty(dto.getAmosCompanySeq())) {
+                    FeignClientResult<CompanyModel> feignClientResult = Privilege.companyClient.seleteOne(Long.parseLong(dto.getAmosCompanySeq()));
+                    if (feignClientResult != null && feignClientResult.getResult() != null) {
+                        Privilege.companyClient.deleteCompany(dto.getAmosCompanySeq());
+                    }
+                }
+                // 失败后回滚：删除已经创建的管理员账号
+                if (StringUtils.isNotEmpty(dto.getAdminUserId())) {
+                    FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient.queryByUserId(dto.getAdminUserId());
+                    if (feignClientResult != null && feignClientResult.getResult() != null) {
+                        Privilege.agencyUserClient.multDeleteUser(dto.getAdminUserId());
+                    }
+                }
+            } catch (Exception rollbackException) {
+                log.error("回滚操作发生异常: {}", rollbackException.getMessage(), rollbackException);
+            }
+
+            throw new RuntimeException("事业单位注册失败，请联系管理员！");
+        }
     }
 
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/flc/biz/service/impl/RegUnitInfoServiceImpl.java

@@ -790,7 +790,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 		}
 	}
 
-	public void createUser(AccountDto dto) {
+	public AgencyUserModel createUser(AccountDto dto) {
 		FeignClientResult<AgencyUserModel> userResult = null;
 		try {
 			List<RoleModel> allRoleList = startPlatformTokenService.getAllRole();
@@ -842,6 +842,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 			if (userResult == null || userResult.getResult() == null) {
 				throw new BadRequest("单位注册失败");
 			}
+			return userResult.getResult();
 		} catch (Exception e) {
 			// 删除已经创建的 企业信息
 			if (dto.getCompanyId() != null) {
@@ -851,7 +852,7 @@ public class RegUnitInfoServiceImpl extends BaseService<RegUnitInfoDto, RegUnitI
 					&& StringUtils.isNotEmpty(userResult.getResult().getUserId())) {
 				Privilege.agencyUserClient.multDeleteUser(userResult.getResult().getUserId());
 			}
-			logger.error(e.getMessage(),e);
+			log.error(e.getMessage(),e);
 			throw new RuntimeException(e.getMessage());
 		}
 	}