diff --git a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java index d61bd6f..637dbd6 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java +++ b/src/main/java/com/glxp/api/controller/sup/UserRegisterController.java @@ -207,19 +207,22 @@ public class UserRegisterController extends BaseController { userCompanyEntity.setCheckStatus(3+""); userRegisterEntity.setCheckStatus(3+""); } - //插入资质证书 - for (UserCertEntity userCertEntity : registComPerResponse.getList()) { - userCertService.saveOrUpdate(userCertEntity); - } - - - userRegisterService.update(userRegisterEntity); - userCompanyService.update(userCompanyEntity); + //是否存在相同企业 + UserCompanyEntity one = userCompanyService.getOne(new QueryWrapper().eq("companyName", registComPerResponse.getCompanyName()).or().eq("creditNum", registComPerResponse.getCreditNum())); + if(one != null){ + return ResultVOUtils.error(500,"已存在该企业!"); + }else{ + //插入资质证书 + for (UserCertEntity userCertEntity : registComPerResponse.getList()) { + userCertService.saveOrUpdate(userCertEntity); + } + userRegisterService.update(userRegisterEntity); + userCompanyService.update(userCompanyEntity); // userPersonService.update(userPersonEntity); + return ResultVOUtils.success(); + } - - return ResultVOUtils.success(); } @@ -261,8 +264,9 @@ public class UserRegisterController extends BaseController { } //通过之后 修改注册状态 和企业状态 将注册信息插入到系统负责人表中 生成用户名密码 userCheckEntity.setCheckResult(1+""); + userCheckEntity.setResultExplain("通过"); //生成账号密码 - String userName = "YY"+UuidUtils.getShortUuid(4); + String userName = "YYJY"+UuidUtils.getShortUuid(4); String password = "123456"; UserRegisterEntity id = userRegisterService.getOne(new QueryWrapper().eq("id", registComPerResponse.getId())); UserPersonEntity userPersonEntity = new UserPersonEntity(); @@ -283,9 +287,10 @@ public class UserRegisterController extends BaseController { userCheckEntity.setId(IdUtil.getSnowflakeNextId()); userCheckEntity.setBusinessId(Long.valueOf(registComPerResponse.getUcId())); userCheckEntity.setCreateUser(registComPerResponse.getReviewer()); - - userCheckEntity.setCheckResult(0+""); - userCheckEntity.setResultExplain(registComPerResponse.getReason()); + if(!"isPass".equals(registComPerResponse.getIsPass())){ + userCheckEntity.setCheckResult(0+""); + userCheckEntity.setResultExplain(registComPerResponse.getReason()); + } userCheckEntity.setCreateTime(new Date()); // userCertSetEntity.setId(IdUtil.getSnowflakeNextId()); diff --git a/src/main/resources/mybatis/mapper/sup/UserCertMapper.xml b/src/main/resources/mybatis/mapper/sup/UserCertMapper.xml index adf532e..068d7a5 100644 --- a/src/main/resources/mybatis/mapper/sup/UserCertMapper.xml +++ b/src/main/resources/mybatis/mapper/sup/UserCertMapper.xml @@ -27,8 +27,19 @@ +