1、增加效验

2、解决已知bug

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

@@ -218,6 +218,10 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_ENTERPRISE_REGISTER_CREDIT_CODE_FORMAT_ERROR
             = new ErrorCode(1_100_021_011, "统一社会信用代码格式不正确");
 
+
+    ErrorCode MDE_ENTERPRISE_REGISTER_CREDIT_CODE_DUPLICATE
+            = new ErrorCode(1_100_021_012, "统一社会信用代码已被注册");
+
     // ========== 企业地址 1_100_022_001 ==========
     ErrorCode MDE_ENTERPRISE_ADDRESS_NOT_EXISTS = new ErrorCode(1_100_022_001, "企业地址不存在");
 

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

@@ -23,12 +23,12 @@ public class AppEnterpriseRegisterReqVO {
     @Schema(description = "联系邮箱")
     private String email;
 
-    @NotBlank(message = "{1_100_021_006}")
+    @NotBlank(message = "{1_100_021_008}")
     @Length(min = 18, max = 18, message = "{1_100_021_011}")
     @Schema(description = "统一社会信用代码")
     private String code;
 
-    @NotBlank(message = "{1_100_021_008}")
+    @NotBlank(message = "{1_100_021_007}")
     @Schema(description = "营业执照图片", example = "https://www.iocoder.cn")
     private String businessLicenseUrl;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseRegisterMapper.java

@@ -6,6 +6,7 @@ import com.citu.framework.mybatis.core.mapper.BaseMapperX;
 import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.citu.module.menduner.system.controller.base.enterprise.register.EnterpriseRegisterPageReqVO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseRegisterDO;
+import com.citu.module.menduner.system.enums.enterprise.EnterpriseRegisterAuditStatusEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -39,4 +40,19 @@ public interface EnterpriseRegisterMapper extends BaseMapperX<EnterpriseRegister
                 .eq(EnterpriseRegisterDO::getUserId, userId)
                 .eq(EnterpriseRegisterDO::getStatus, status));
     }
+
+    /**
+     * 根据邀请码查询
+     *
+     * @param id  编码
+     * @param code 邀请码
+     * @return 是否存在
+     */
+    default Boolean existsByCode(Long id,String code) {
+        return selectCount(new LambdaQueryWrapperX<EnterpriseRegisterDO>()
+                .eq(EnterpriseRegisterDO::getCode, code)
+                .neIfPresent(EnterpriseRegisterDO::getId, id)
+                .eq(EnterpriseRegisterDO::getStatus, EnterpriseRegisterAuditStatusEnum.APPROVED.getStatus())
+        ) > 0;
+    }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/interview/InterviewInviteMapper.java

@@ -187,7 +187,7 @@ public interface InterviewInviteMapper extends BaseMapperX<InterviewInviteDO> {
         wrapper.selectCount(InterviewInviteDO::getId, CommonRespVO::getValue);
         wrapper.innerJoin(JobCvRelDO.class, on -> on
                         .eq(JobCvRelDO::getJobId, InterviewInviteDO::getJobId)
-                        .eq(JobCvRelDO::getRecommendUserId, InterviewInviteDO::getUserId)
+                        .eq(JobCvRelDO::getUserId, InterviewInviteDO::getUserId)
         );
         wrapper.eq(JobCvRelDO::getType, "1");
         wrapper.eq(JobCvRelDO::getRecommendUserId,userId);

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/job/JobCvRelMapper.java

@@ -20,7 +20,6 @@ import com.citu.module.menduner.system.dal.dataobject.job.JobCvRelDO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.dal.dataobject.unfit.UnfitCandidateDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
-import com.citu.module.menduner.system.enums.cv.ConversationStatusEnum;
 import com.citu.module.menduner.system.enums.cv.JobCvRelStatusEnum;
 import com.citu.module.menduner.system.enums.unfit.UnfitTypeEnum;
 import org.apache.ibatis.annotations.Mapper;
@@ -134,14 +133,14 @@ public interface JobCvRelMapper extends BaseMapperX<JobCvRelDO> {
 
         wrapper.eq(JobCvRelDO::getRecommendUserId, userId);
 
-        // TODO 此处有坑
-        //        if (Integer.parseInt(reqVO.getStatus()) > 0) {
-        //            wrapper.selectAll(InterviewInviteDO.class);
-        //            wrapper.innerJoin(InterviewInviteDO.class,on->on
-        //                    .eq(InterviewInviteDO::getJobId, JobAdvertisedDO::getId));
-        //            wrapper.eq(InterviewInviteDO::getConversationStatus,
-        //                    reqVO.getStatus());
-        //        }
+        if (Integer.parseInt(reqVO.getStatus()) > 0) {
+            wrapper.innerJoin(InterviewInviteDO.class, on -> on
+                    .eq(InterviewInviteDO::getJobId, JobAdvertisedDO::getId)
+                    .eq(JobCvRelDO::getUserId, InterviewInviteDO::getUserId)
+            );
+            wrapper.eq(InterviewInviteDO::getConversationStatus,
+                    reqVO.getStatus());
+        }
 
         setUnfitCandidate(wrapper);
 

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

@@ -175,6 +175,10 @@ public class EnterpriseRegisterServiceImpl implements EnterpriseRegisterService
             // 存在审批中的申请
             throw exception(MDE_ENTERPRISE_REGISTER_APPLY_DUPLICATE);
         }
+        if(enterpriseRegisterMapper.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());

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/HireJobIntegrationServiceImpl.java

@@ -205,10 +205,10 @@ public class HireJobIntegrationServiceImpl implements HireJobIntegrationService
             userAccountRecordService.createPointRecord(
                     cv.getUserId(),
                     "",
-                    PointBizTypeEnum.RECOMMENDED_POSITIONS.getName(),
+                    PointBizTypeEnum.DELIVERY_PERSON.getName(),
                     MathOperationEnum.ADD,
                     cvPoint,
-                    PointBizTypeEnum.RECOMMENDED_POSITIONS,
+                    PointBizTypeEnum.DELIVERY_PERSON,
                     String.valueOf(job.getId())
             );
         }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -405,7 +405,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
 //            }
             // TODO 暂时不给改，不清楚逻辑
             if (null != reqVO.getHirePrice()) {
-                if (!entity.getHirePrice().equals(reqVO.getHirePrice())) {
+                if (entity.getHirePrice().compareTo(reqVO.getHirePrice())!=0) {
                     throw exception(MDE_JOB_ADVERTISED_BALANCE_UPDATE);
                 }
             }

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

@@ -169,6 +169,7 @@
 1_100_021_009=Enterprise registered
 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_022_001 ==========
 1_100_022_001=The company address does not exist
 # ========== 企业登录用户 1_100_023_000 ==========

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

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