1、区分企业邀请同意接口

2、增加权益标识，是否有招聘会权限

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/invite/AppEnterpriseInviteRecordController.java

@@ -0,0 +1,37 @@
+package com.citu.module.menduner.system.controller.app.jobhunt.invite;
+
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.security.core.annotations.PreAuthenticated;
+import com.citu.module.menduner.system.controller.app.recruit.invite.vo.AppRecruitEnterpriseInviteConsentReqVO;
+import com.citu.module.menduner.system.service.invite.EnterpriseInviteRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "求职端 - 企业邀请")
+@RestController
+@RequestMapping("/menduner/system/enterprise-invite-record")
+@Validated
+public class AppEnterpriseInviteRecordController {
+
+
+    @Resource
+    private EnterpriseInviteRecordService service;
+
+
+    @PreAuthenticated
+    @PostMapping("/consent")
+    @Operation(summary = "同意加入")
+    public CommonResult<Boolean> consent(AppRecruitEnterpriseInviteConsentReqVO reqVO) {
+        service.jobSeekerConsentToEnterpriseInvite(reqVO);
+        return success(true);
+    }
+
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/invite/AppRecruitEnterpriseInviteRecordController.java

@@ -39,7 +39,7 @@ public class AppRecruitEnterpriseInviteRecordController {
     @PostMapping("/consent")
     @Operation(summary = "同意加入")
     public CommonResult<Boolean> consent(AppRecruitEnterpriseInviteConsentReqVO reqVO) {
-        service.consent(reqVO);
+        service.enterpriseAdminConsentToSubordinateJoin(reqVO);
         return success(true);
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vip/EnterpriseEntitlementRespVO.java

@@ -49,6 +49,10 @@ public class EnterpriseEntitlementRespVO {
     @ExcelProperty("是否开启新任命")
     private Boolean newAppointment;
 
+    @Schema(description = "是否有参加招聘会权限", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否有参加招聘会权限")
+    private Boolean jobFair;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vip/EnterpriseEntitlementSaveReqVO.java

@@ -1,5 +1,6 @@
 package com.citu.module.menduner.system.controller.base.enterprise.vip;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -34,4 +35,7 @@ public class EnterpriseEntitlementSaveReqVO {
     @Schema(description = "是否开启新任命", requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean newAppointment;
 
+    @Schema(description = "是否有参加招聘会权限", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean jobFair;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vip/EnterpriseEntitlementSimpleReqVO.java

@@ -34,4 +34,7 @@ public class EnterpriseEntitlementSimpleReqVO {
     @Schema(description = "是否开启新任命", requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean newAppointment;
 
+    @Schema(description = "是否有参加招聘会权限", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean jobFair;
+
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vip/EnterprisePackageRespVO.java

@@ -77,6 +77,10 @@ public class EnterprisePackageRespVO {
     @ExcelProperty("是否开启新任命")
     private Boolean newAppointment;
 
+    @Schema(description = "是否有参加招聘会权限", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否有参加招聘会权限")
+    private Boolean jobFair;
+
     @Schema(description = "排序")
     @ExcelProperty("排序")
     private Integer sort;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vip/EnterprisePackageSaveReqVO.java

@@ -67,6 +67,9 @@ public class EnterprisePackageSaveReqVO {
     @Schema(description = "是否开启新任命", requiredMode = Schema.RequiredMode.REQUIRED)
     private Boolean newAppointment;
 
+    @Schema(description = "是否有参加招聘会权限", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean jobFair;
+
     @Schema(description = "排序")
     private Integer sort;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterpriseEntitlementDO.java

@@ -59,5 +59,9 @@ public class EnterpriseEntitlementDO extends BaseDO {
      * 是否开启新任命
      */
     private Boolean newAppointment;
+    /**
+     * 是否有参加招聘会权限
+     */
+    private Boolean jobFair;
 
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/enterprise/EnterprisePackageDO.java

@@ -87,6 +87,10 @@ public class EnterprisePackageDO extends TenantBaseDO {
      * 是否开启新任命
      */
     private Boolean newAppointment;
+    /**
+     * 是否有参加招聘会权限
+     */
+    private Boolean jobFair;
     /**
      * 排序
      */

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/vip/EnterpriseEntitlementServiceImpl.java

@@ -130,6 +130,7 @@ public class EnterpriseEntitlementServiceImpl implements EnterpriseEntitlementSe
                     .personMap(packageDO.getPersonMap())
                     .hireJob(packageDO.getHireJob())
                     .newAppointment(packageDO.getNewAppointment())
+                    .jobFair(packageDO.getJobFair())
                     .build();
             // 如果vip标识大于0 并且vip时间没有过期,并且创建时间是在2024-1月1号之前的
             if (null != enterprise.getVipFlag()) {
@@ -197,6 +198,7 @@ public class EnterpriseEntitlementServiceImpl implements EnterpriseEntitlementSe
                     .personMap(reqVO.getEntitlement().getPersonMap())
                     .hireJob(reqVO.getEntitlement().getHireJob())
                     .newAppointment(reqVO.getEntitlement().getNewAppointment())
+                    .jobFair(reqVO.getEntitlement().getJobFair())
                     .build();
 
             mapper.insert(insert);
@@ -216,6 +218,7 @@ public class EnterpriseEntitlementServiceImpl implements EnterpriseEntitlementSe
                     .personMap(reqVO.getEntitlement().getPersonMap())
                     .hireJob(reqVO.getEntitlement().getHireJob())
                     .newAppointment(reqVO.getEntitlement().getNewAppointment())
+                    .jobFair(reqVO.getEntitlement().getJobFair())
                     .build();
             mapper.updateById(update);
         }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/vip/EnterprisePackageServiceImpl.java

@@ -25,12 +25,13 @@ import static com.citu.module.menduner.system.enums.ErrorCodeConstants.ENTERPRIS
 @Validated
 public class EnterprisePackageServiceImpl implements EnterprisePackageService {
 
+    /**
+     * 对外的企业vip套餐
+     **/
+    private static final String ENTERPRISE_EXTERNAL_TYPE_VIP = "1";
     @Resource
     private EnterprisePackageMapper mapper;
 
-    /** 对外的企业vip套餐 **/
-    private static final String ENTERPRISE_EXTERNAL_TYPE_VIP = "1";
-
     @Override
     public Long createEnterprisePackage(EnterprisePackageSaveReqVO createReqVO) {
         // 插入
@@ -84,11 +85,11 @@ public class EnterprisePackageServiceImpl implements EnterprisePackageService {
 
     @Override
     public List<EnterprisePackageDO> getList() {
-        return mapper.list(false,ENTERPRISE_EXTERNAL_TYPE_VIP);
+        return mapper.list(false, ENTERPRISE_EXTERNAL_TYPE_VIP);
     }
 
     @Override
     public List<EnterprisePackageDO> getListAll() {
-        return mapper.list(null,null);
+        return mapper.list(null, null);
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/invite/EnterpriseInviteRecordService.java

@@ -56,6 +56,14 @@ public interface EnterpriseInviteRecordService {
      */
     PageResult<EnterpriseInviteRecordDO> getEnterpriseInviteRecordPage(EnterpriseInviteRecordPageReqVO pageReqVO);
 
+    // ========== 求职端 ==========
+    /**
+     * 同意加入
+     *
+     * @param reqVO 邀请对象
+     */
+    void jobSeekerConsentToEnterpriseInvite(AppRecruitEnterpriseInviteConsentReqVO reqVO);
+
     // ========== 招聘端 ==========
 
     /**
@@ -63,7 +71,7 @@ public interface EnterpriseInviteRecordService {
      *
      * @param reqVO 邀请对象
      */
-    void consent(AppRecruitEnterpriseInviteConsentReqVO reqVO);
+    void enterpriseAdminConsentToSubordinateJoin(AppRecruitEnterpriseInviteConsentReqVO reqVO);
 
     /**
      * 获得企业邀请记录分页

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/invite/EnterpriseInviteRecordServiceImpl.java

@@ -118,10 +118,8 @@ public class EnterpriseInviteRecordServiceImpl implements EnterpriseInviteRecord
     @CacheEvict(cacheNames = {
             RedisKeyConstants.MDE_ENTERPRISE_TREE
     }, allEntries = true)
-    public void consent(AppRecruitEnterpriseInviteConsentReqVO reqVO) {
-        LoginUser loginUser = LoginUserContext.get();
-        Long enterpriseId = LoginUserContext.getEnterpriseId2(loginUser);
-        Long userId = LoginUserContext.getUserId(loginUser);
+    public void jobSeekerConsentToEnterpriseInvite(AppRecruitEnterpriseInviteConsentReqVO reqVO) {
+        Long userId = LoginUserContext.getUserId();
 
         EnterpriseInviteDO invite = inviteService.getByCode(reqVO.getCode());
 
@@ -166,8 +164,35 @@ public class EnterpriseInviteRecordServiceImpl implements EnterpriseInviteRecord
             userBindService.createUser(userBindDO);
 
 
-        } else {
+        }
+
+        // 增加邀请记录
+        mapper.insert(
+                EnterpriseInviteRecordDO.builder()
+                        .enterpriseId(invite.getEnterpriseId())
+                        .userId(userId)
+                        .inviteEnterpriseId(invite.getEnterpriseId())
+                        .inviteUserId(invite.getUserId())
+                        .type(invite.getType())
+                        .code(invite.getCode())
+                        .build()
+        );
+    }
 
+    @Override
+    @DSTransactional
+    @CacheEvict(cacheNames = {
+            RedisKeyConstants.MDE_ENTERPRISE_TREE
+    }, allEntries = true)
+    public void enterpriseAdminConsentToSubordinateJoin(AppRecruitEnterpriseInviteConsentReqVO reqVO) {
+        Long enterpriseId = LoginUserContext.getEnterpriseId();
+        Long userId = LoginUserContext.getUserId();
+
+        EnterpriseInviteDO invite = inviteService.getByCode(reqVO.getCode());
+        if (EnterpriseInviteTypeEnum.SUBSIDIARY.getType()
+                .equals(invite.getType())) {
+
+            // 查询是否已经加入
             EnterpriseUserBindDO userBind = userBindService
                     .selectByEnterpriseIdAndUserId(enterpriseId, userId);
 
@@ -187,13 +212,12 @@ public class EnterpriseInviteRecordServiceImpl implements EnterpriseInviteRecord
             }
             // 更改企业的上级
             enterpriseService.updateParent(enterpriseId, invite.getEnterpriseId());
-        }
 
+        }
         // 增加邀请记录
         mapper.insert(
                 EnterpriseInviteRecordDO.builder()
-                        .enterpriseId(EnterpriseInviteTypeEnum.COLLEAGUE.getType()
-                                .equals(invite.getType()) ? invite.getEnterpriseId() : enterpriseId)
+                        .enterpriseId(enterpriseId)
                         .userId(userId)
                         .inviteEnterpriseId(invite.getEnterpriseId())
                         .inviteUserId(invite.getUserId())
@@ -201,5 +225,7 @@ public class EnterpriseInviteRecordServiceImpl implements EnterpriseInviteRecord
                         .code(invite.getCode())
                         .build()
         );
+
     }
+
 }