Parcourir la source

1、优化企业注册流程
2、加入兼容筹建的企业

rayson il y a 10 mois
Parent
commit
51bd89cfcd
13 fichiers modifiés avec 211 ajouts et 49 suppressions
  1. 4 0
      menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java
  2. 15 4
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/register/AppEnterpriseRegisterReqVO.java
  3. 9 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/register/EnterpriseRegisterPageReqVO.java
  4. 12 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/register/EnterpriseRegisterRespVO.java
  5. 9 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/register/EnterpriseRegisterSaveReqVO.java
  6. 13 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseRegisterDO.java
  7. 10 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseService.java
  8. 20 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java
  9. 18 0
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/business/EnterpriseBusinessService.java
  10. 17 1
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/business/EnterpriseBusinessServiceImpl.java
  11. 82 44
      menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java
  12. 1 0
      menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties
  13. 1 0
      menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

+ 4 - 0
menduner/menduner-system-api/src/main/java/com/citu/module/menduner/system/enums/ErrorCodeConstants.java

@@ -224,6 +224,10 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_ENTERPRISE_REGISTER_CREDIT_CODE_DUPLICATE
             = new ErrorCode(1_100_021_012, "统一社会信用代码已被注册");
 
+
+    ErrorCode MDE_ENTERPRISE_CONTACT_NAME_NOT_NULL = new ErrorCode(1_100_021_013, "联系人名称不能为空");
+
+
     // ========== 企业地址 1_100_022_001 ==========
     ErrorCode MDE_ENTERPRISE_ADDRESS_NOT_EXISTS = new ErrorCode(1_100_022_001, "企业地址不存在");
 

+ 15 - 4
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/enterprise/vo/register/AppEnterpriseRegisterReqVO.java

@@ -12,9 +12,13 @@ import javax.validation.constraints.NotBlank;
 public class AppEnterpriseRegisterReqVO {
 
     @NotBlank(message = "{1_100_021_004}")
-    @Schema(description = "企业名称", example = "芋艿")
+    @Schema(description = "企业名称", example = "xx公司")
     private String name;
 
+    @NotBlank(message = "{1_100_021_013}")
+    @Schema(description = "联系人名称", example = "张三")
+    private String contactName;
+
     @NotBlank(message = "{1_100_021_005}")
     @Schema(description = "联系电话")
     private String phone;
@@ -23,13 +27,20 @@ public class AppEnterpriseRegisterReqVO {
     @Schema(description = "联系邮箱")
     private String email;
 
-    @NotBlank(message = "{1_100_021_008}")
-    @Length(min = 18, max = 18, message = "{1_100_021_011}")
+    @Schema(description = "说明")
+    private String description;
+
+    @Schema(description = "是否筹备", example = "false")
+    private Boolean prepare;
+
+    // ========== 非筹备中需要填写 ==========
+
     @Schema(description = "统一社会信用代码")
     private String code;
 
-    @NotBlank(message = "{1_100_021_007}")
     @Schema(description = "营业执照图片", example = "https://www.iocoder.cn")
     private String businessLicenseUrl;
 
+
+
 }

+ 9 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/register/EnterpriseRegisterPageReqVO.java

@@ -22,6 +22,15 @@ public class EnterpriseRegisterPageReqVO extends PageParam {
     @Schema(description = "企业名称", example = "芋艿")
     private String name;
 
+    @Schema(description = "联系人姓名", example = "芋艿")
+    private String contactName;
+
+    @Schema(description = "是否筹备")
+    private Boolean prepare;
+
+    @Schema(description = "说明")
+    private String description;
+
     @Schema(description = "联系电话")
     private String phone;
 

+ 12 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/register/EnterpriseRegisterRespVO.java

@@ -28,6 +28,18 @@ public class EnterpriseRegisterRespVO {
     @ExcelProperty("企业名称")
     private String name;
 
+    @Schema(description = "联系人姓名", example = "芋艿")
+    @ExcelProperty("联系人姓名")
+    private String contactName;
+
+    @Schema(description = "是否筹备")
+    @ExcelProperty("是否筹备")
+    private Boolean prepare;
+
+    @Schema(description = "说明")
+    @ExcelProperty("说明")
+    private String description;
+
     @Schema(description = "联系电话")
     @ExcelProperty("联系电话")
     private String phone;

+ 9 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/register/EnterpriseRegisterSaveReqVO.java

@@ -19,6 +19,15 @@ public class EnterpriseRegisterSaveReqVO {
     @Schema(description = "企业名称", example = "芋艿")
     private String name;
 
+    @Schema(description = "联系人姓名", example = "芋艿")
+    private String contactName;
+
+    @Schema(description = "是否筹备")
+    private Boolean prepare;
+
+    @Schema(description = "说明")
+    private String description;
+
     @Schema(description = "联系电话")
     private String phone;
 

+ 13 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseRegisterDO.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.citu.framework.mybatis.core.dataobject.BaseDO;
 import com.citu.framework.tenant.core.db.TenantBaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 /**
@@ -35,6 +36,10 @@ public class EnterpriseRegisterDO extends TenantBaseDO {
      * 企业名称
      */
     private String name;
+    /**
+     * 联系人名称
+     */
+    private String contactName;
     /**
      * 联系电话
      */
@@ -43,6 +48,14 @@ public class EnterpriseRegisterDO extends TenantBaseDO {
      * 联系邮箱
      */
     private String email;
+    /**
+     * 是否筹备
+     */
+    private Boolean prepare;
+    /**
+     * 说明
+     */
+    private String description;
     /**
      * 统一社会信用代码
      */

+ 10 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseService.java

@@ -115,6 +115,16 @@ public interface EnterpriseService {
      * @param parentId 父企业id
      */
     void updateParent(Long id, Long parentId);
+
+    /**
+     * 更新企业父企业
+     *
+     * @param name 企业名称
+     * @param contactName 联系人名称
+     * @param phone 联系电话
+     * @param prepare 是否筹备
+     */
+    Long createSimpleEnterprise(String name,String contactName, String phone,Boolean prepare);
     // ========== 求职端 ==========
     /**
      * 点击执行埋点

+ 20 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -21,6 +21,7 @@ import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseAddressMap
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseBusinessMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
+import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.enums.visits.MdeVisitsEnum;
 import com.citu.module.menduner.system.mq.producer.ESProducer;
 import com.citu.module.menduner.system.mq.producer.MdeVisitsProducer;
@@ -194,6 +195,25 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         enterpriseMapper.updateById(enterprise);
     }
 
+    @Override
+    @CacheEvict(cacheNames = {
+            RedisKeyConstants.MDE_ENTERPRISE_TREE,
+            RedisKeyConstants.ENTERPRISE_CHILDREN_IDS
+    }, allEntries = true)
+    public Long createSimpleEnterprise(String name,String contactName, String phone, Boolean prepare) {
+        EnterpriseDO enterprise = new EnterpriseDO();
+        enterprise.setName(name);
+        enterprise.setContact(contactName);
+        enterprise.setAnotherName(name);
+        enterprise.setPhone(phone);
+        enterprise.setPrepare(prepare);
+        enterprise.setParentId(0L);
+        enterprise.setStatus(MendunerStatusEnum.ENABLE.getStatus());
+        enterpriseMapper.insert(enterprise);
+        // 返回
+        return enterprise.getId();
+    }
+
     @Override
     public void click(AppEnterpriseClickReqVO reqVO) {
         producer.send(MdeVisitsEnum.ENTERPRISE_CLICK, reqVO.getId());

+ 18 - 0
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/business/EnterpriseBusinessService.java

@@ -54,6 +54,24 @@ public interface EnterpriseBusinessService {
      */
     PageResult<EnterpriseBusinessDO> getEnterpriseBusinessPage(EnterpriseBusinessPageReqVO pageReqVO);
 
+    /**
+     * 根据社会统一信用代码获取工商信息
+     *
+     * @param code 社会统一信用代码
+     * @return 企业工商信息
+     */
+    EnterpriseBusinessDO getByCode(String code);
+
+    /**
+     * 新增简易的工商信息
+     *
+     * @param code 社会统一信用代码
+     * @param enterpriseId 企业id
+     * @param name 企业名称
+     * @return 企业工商信息
+     */
+    Long createSimpleBusiness(Long enterpriseId,String code,String name);
+
     // ========== 招聘端 ==========
 
     /**

+ 17 - 1
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/business/EnterpriseBusinessServiceImpl.java

@@ -3,6 +3,7 @@ package com.citu.module.menduner.system.service.enterprise.business;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.app.recruit.enterprise.vo.AppRecruitEnterpriseBusinessRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.enterprise.vo.AppRecruitEnterpriseBusinessSaveReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.business.EnterpriseBusinessPageReqVO;
@@ -10,7 +11,6 @@ import com.citu.module.menduner.system.controller.base.enterprise.business.Enter
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseBusinessMapper;
-import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -73,6 +73,22 @@ public class EnterpriseBusinessServiceImpl implements EnterpriseBusinessService
         return enterpriseBusinessMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public EnterpriseBusinessDO getByCode(String code) {
+        return enterpriseBusinessMapper.selectByCode(code);
+    }
+
+    @Override
+    public Long createSimpleBusiness(Long enterpriseId, String code, String name) {
+        EnterpriseBusinessDO business = EnterpriseBusinessDO.builder()
+                .code(code)
+                .name(name)
+                .enterpriseId(enterpriseId)
+                .build();
+        enterpriseBusinessMapper.insert(business);
+        return business.getEnterpriseId();
+    }
+
     public EnterpriseBusinessDO selectBusiness() {
         EnterpriseBusinessDO businessDO =
                 enterpriseBusinessMapper.selectByEnterpriseId(LoginUserContext.getEnterpriseId());

+ 82 - 44
menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java

@@ -4,6 +4,8 @@ package com.citu.module.menduner.system.service.enterprise.register;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
+import com.citu.framework.common.util.validation.ValidationUtils;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.register.AppEnterpriseRegisterReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.register.AppEnterpriseRegisterRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.register.EnterpriseRegisterAuditReqVO;
@@ -11,18 +13,18 @@ import com.citu.module.menduner.system.controller.base.enterprise.register.Enter
 import com.citu.module.menduner.system.controller.base.enterprise.register.EnterpriseRegisterSaveReqVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseBusinessMapper;
-import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseRegisterMapper;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.enums.enterprise.EnterpriseRegisterAuditStatusEnum;
 import com.citu.module.menduner.system.enums.enterprise.EnterpriseUserTypeEnum;
+import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
-import com.citu.module.menduner.common.util.LoginUserContext;
+import com.citu.module.menduner.system.service.enterprise.business.EnterpriseBusinessService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -40,13 +42,13 @@ import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
 public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService {
 
     @Resource
-    private EnterpriseRegisterMapper enterpriseRegisterMapper;
+    private EnterpriseRegisterMapper mapper;
 
     @Resource
-    private EnterpriseBusinessMapper enterpriseBusinessMapper;
+    private EnterpriseBusinessService businessService;
 
     @Resource
-    private EnterpriseMapper enterpriseMapper;
+    private EnterpriseService enterpriseService;
 
     @Resource
     private EnterpriseUserBindService userBindService;
@@ -55,7 +57,7 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
     public Long createEnterpriseRegister(EnterpriseRegisterSaveReqVO createReqVO) {
         // 插入
         EnterpriseRegisterDO enterpriseRegister = BeanUtils.toBean(createReqVO, EnterpriseRegisterDO.class);
-        enterpriseRegisterMapper.insert(enterpriseRegister);
+        mapper.insert(enterpriseRegister);
         // 返回
         return enterpriseRegister.getId();
     }
@@ -66,7 +68,7 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
         validateEnterpriseRegisterExists(updateReqVO.getId());
         // 更新
         EnterpriseRegisterDO updateObj = BeanUtils.toBean(updateReqVO, EnterpriseRegisterDO.class);
-        enterpriseRegisterMapper.updateById(updateObj);
+        mapper.updateById(updateObj);
     }
 
     @Override
@@ -74,29 +76,29 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
         // 校验存在
         validateEnterpriseRegisterExists(id);
         // 删除
-        enterpriseRegisterMapper.deleteById(id);
+        mapper.deleteById(id);
     }
 
     private void validateEnterpriseRegisterExists(Long id) {
-        if (enterpriseRegisterMapper.selectById(id) == null) {
+        if (mapper.selectById(id) == null) {
             throw exception(MDE_ENTERPRISE_REGISTER_NOT_EXISTS);
         }
     }
 
     @Override
     public EnterpriseRegisterDO getEnterpriseRegister(Long id) {
-        return enterpriseRegisterMapper.selectById(id);
+        return mapper.selectById(id);
     }
 
     @Override
     public PageResult<EnterpriseRegisterDO> getEnterpriseRegisterPage(EnterpriseRegisterPageReqVO pageReqVO) {
-        return enterpriseRegisterMapper.selectPage(pageReqVO);
+        return mapper.selectPage(pageReqVO);
     }
 
     @Override
     @DSTransactional
     public void approved(EnterpriseRegisterAuditReqVO reqVO) {
-        EnterpriseRegisterDO enterpriseRegister = enterpriseRegisterMapper.selectById(reqVO.getId());
+        EnterpriseRegisterDO enterpriseRegister = mapper.selectById(reqVO.getId());
         if (null == enterpriseRegister) {
             throw exception(MDE_ENTERPRISE_REGISTER_NOT_EXISTS);
         }
@@ -105,47 +107,44 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
             // 已审批
             throw exception(MDE_ENTERPRISE_REGISTER_AUDITING_APPROVED);
         }
-        EnterpriseBusinessDO enterpriseBusinessDO = enterpriseBusinessMapper.selectByCode(enterpriseRegister.getCode());
+        // 查询社会统一信用代码是否存在
+        EnterpriseBusinessDO enterpriseBusinessDO = businessService.getByCode(enterpriseRegister.getCode());
         if (null != enterpriseBusinessDO) {
             throw exception(MDE_ENTERPRISE_REGISTER_DUPLICATE);
         }
 
         enterpriseRegister.setStatus(EnterpriseRegisterAuditStatusEnum.APPROVED.getStatus());
         enterpriseRegister.setReason(reqVO.getReason());
-        enterpriseRegisterMapper.updateById(enterpriseRegister);
+        mapper.updateById(enterpriseRegister);
 
         // 增加企业信息
-        EnterpriseDO enterprise = new EnterpriseDO();
-        enterprise.setName(enterpriseRegister.getName());
-        enterprise.setAnotherName(enterpriseRegister.getName());
-        enterprise.setStatus(MendunerStatusEnum.ENABLE.getStatus());
-        enterpriseMapper.insert(enterprise);
+        Long enterpriseId = enterpriseService.createSimpleEnterprise(
+                enterpriseRegister.getName(), enterpriseRegister.getContactName(),
+                enterpriseRegister.getPhone(), enterpriseRegister.getPrepare());
 
         // 增加企业工商信息
-        EnterpriseBusinessDO business = new EnterpriseBusinessDO();
-        business.setEnterpriseId(enterprise.getId());
-        business.setCode(enterpriseRegister.getCode());
-        business.setName(enterpriseRegister.getName());
-
-        enterpriseBusinessMapper.insert(business);
+        if(StringUtils.hasText(enterpriseRegister.getCode())) {
+            // 不为空时添加工商信息
+            businessService.createSimpleBusiness(enterpriseId, enterpriseRegister.getCode(), enterpriseRegister.getName());
+        }
 
         // 增加企业用户
-        EnterpriseUserBindDO userBindDO = new EnterpriseUserBindDO();
-        userBindDO.setEnterpriseId(enterprise.getId());
-        userBindDO.setUserId(enterpriseRegister.getUserId());
-        userBindDO.setName(enterpriseRegister.getName()+"-"+"BOSS");
-        userBindDO.setStatus(MendunerStatusEnum.ENABLE.getStatus());
-        userBindDO.setUserType(EnterpriseUserTypeEnum.ADMIN.getType());
-        userBindDO.setPhone(enterpriseRegister.getPhone());
-        userBindDO.setEmail(enterpriseRegister.getEmail());
-
+        EnterpriseUserBindDO userBindDO = EnterpriseUserBindDO.builder()
+                .enterpriseId(enterpriseId)
+                .userId(enterpriseRegister.getUserId())
+                .name(enterpriseRegister.getContactName())
+                .status(MendunerStatusEnum.ENABLE.getStatus())
+                .phone(enterpriseRegister.getPhone())
+                .email(enterpriseRegister.getEmail())
+                .userType(EnterpriseUserTypeEnum.ADMIN.getType())
+                .build();
         userBindService.createUser(userBindDO);
     }
 
     @Override
     @DSTransactional
     public void reject(EnterpriseRegisterAuditReqVO reqVO) {
-        EnterpriseRegisterDO enterpriseRegister = enterpriseRegisterMapper.selectById(reqVO.getId());
+        EnterpriseRegisterDO enterpriseRegister = mapper.selectById(reqVO.getId());
         if (null == enterpriseRegister) {
             throw exception(MDE_ENTERPRISE_REGISTER_NOT_EXISTS);
         }
@@ -161,29 +160,68 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
         }
         enterpriseRegister.setStatus(EnterpriseRegisterAuditStatusEnum.REJECT.getStatus());
         enterpriseRegister.setReason(reqVO.getReason());
-        enterpriseRegisterMapper.updateById(enterpriseRegister);
+        mapper.updateById(enterpriseRegister);
     }
 
     @Override
     @DSTransactional
     public void apply(AppEnterpriseRegisterReqVO reqVO) {
-        if (enterpriseRegisterMapper.selectCountByUserIdAndStatus(LoginUserContext.getUserId(),
+
+        validateApply(reqVO);
+        EnterpriseRegisterDO register = EnterpriseConvert.INSTANCE.convert6(reqVO);
+        register.setStatus(EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus());
+        register.setUserId(LoginUserContext.getUserId());
+        mapper.insert(register);
+    }
+
+    /** 效验企业申请注册参数 **/
+    public void validateApply(AppEnterpriseRegisterReqVO reqVO) {
+        if (null == reqVO.getPrepare() || !reqVO.getPrepare()) {
+            // 非筹备中,参数一定要填
+            if (!StringUtils.hasText(reqVO.getCode())) {
+                // 统一社会信用代码为空
+                throw exception(MDE_ENTERPRISE_REGISTER_CREDIT_CODE_NOT_NULL);
+            }
+            if (reqVO.getCode().length() != 18) {
+                // 统一社会信用代码
+                throw exception(MDE_ENTERPRISE_REGISTER_CREDIT_CODE_FORMAT_ERROR);
+            }
+            if (!ValidationUtils.isURL(reqVO.getBusinessLicenseUrl())) {
+                // 营业执照图片
+                throw exception(MDE_ENTERPRISE_REGISTER_BUSINESS_LICENSE_URL_NOT_NULL);
+            }
+            reqVO.setPrepare(false);
+        }else {
+            // 筹备中 可以不填,填了就效验
+            if (StringUtils.hasText(reqVO.getCode())) {
+                if (reqVO.getCode().length() != 18) {
+                    // 统一社会信用代码
+                    throw exception(MDE_ENTERPRISE_REGISTER_CREDIT_CODE_FORMAT_ERROR);
+                }
+            }
+            if(StringUtils.hasText(reqVO.getBusinessLicenseUrl())) {
+                if (!ValidationUtils.isURL(reqVO.getBusinessLicenseUrl())) {
+                    // 营业执照图片
+                    throw exception(MDE_ENTERPRISE_REGISTER_BUSINESS_LICENSE_URL_NOT_NULL);
+                }
+            }
+            reqVO.setPrepare(true);
+
+        }
+
+        if (mapper.selectCountByUserIdAndStatus(LoginUserContext.getUserId(),
                 EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus()) > 0) {
             // 存在审批中的申请
             throw exception(MDE_ENTERPRISE_REGISTER_APPLY_DUPLICATE);
         }
-        if(enterpriseRegisterMapper.existsByCode(null, reqVO.getCode())) {
+        if (mapper.existsByCode(null, reqVO.getCode())) {
             // 重复
             throw exception(MDE_ENTERPRISE_REGISTER_CREDIT_CODE_DUPLICATE);
         }
-        EnterpriseRegisterDO register = EnterpriseConvert.INSTANCE.convert6(reqVO);
-        register.setStatus(EnterpriseRegisterAuditStatusEnum.AUDITING.getStatus());
-        register.setUserId(LoginUserContext.getUserId());
-        enterpriseRegisterMapper.insert(register);
     }
 
     @Override
     public AppEnterpriseRegisterRespVO getApplyByUserId() {
-        return EnterpriseConvert.INSTANCE.convert8(enterpriseRegisterMapper.selectByUserId(LoginUserContext.getUserId()));
+        return EnterpriseConvert.INSTANCE.convert8(mapper.selectByUserId(LoginUserContext.getUserId()));
     }
 }

+ 1 - 0
menduner/menduner-system-biz/src/main/resources/i18n/messages_en_US.properties

@@ -171,6 +171,7 @@
 1_100_021_010=The enterprise has applied for review, please do not resubmit
 1_100_021_011=Incorrect format of unified social credit code
 1_100_021_012=Unified Social Credit Code has been registered
+1_100_021_013=Contact name cannot be empty
 # ========== 企业地址 1_100_022_001 ==========
 1_100_022_001=The company address does not exist
 # ========== 企业登录用户 1_100_023_000 ==========

+ 1 - 0
menduner/menduner-system-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -171,6 +171,7 @@
 1_100_021_010=企业申请审核中,请勿重复提交
 1_100_021_011=统一社会信用代码格式不正确
 1_100_021_012=统一社会信用代码已被注册
+1_100_021_013=联系人名称不能为空
 # ========== 企业地址 1_100_022_001 ==========
 1_100_022_001=企业地址不存在
 # ========== 企业登录用户 1_100_023_000 ==========