1、注释签到接口

2、优化职位保存逻辑

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/app/sigin/AppSignInConfigController.java

@@ -27,11 +27,11 @@ public class AppSignInConfigController {
     @Resource
     private SignInConfigService signInConfigService;
 
-    @GetMapping("/list")
-    @Operation(summary = "获得签到规则列表")
-    public CommonResult<List<AppSignInConfigRespVO>> getSignInConfigList() {
-        List<SignInConfigDO> pageResult = signInConfigService.getSignInConfigList(CommonStatusEnum.ENABLE.getStatus());
-        return success(SignInConfigConvert.INSTANCE.convertList2(pageResult));
-    }
+//    @GetMapping("/list")
+//    @Operation(summary = "获得签到规则列表")
+//    public CommonResult<List<AppSignInConfigRespVO>> getSignInConfigList() {
+//        List<SignInConfigDO> pageResult = signInConfigService.getSignInConfigList(CommonStatusEnum.ENABLE.getStatus());
+//        return success(SignInConfigConvert.INSTANCE.convertList2(pageResult));
+//    }
 
 }

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/app/sigin/AppSignInRecordController.java

@@ -31,27 +31,27 @@ public class AppSignInRecordController {
     @Resource
     private SignInRecordService signInRecordService;
 
-    @GetMapping("/get-summary")
-    @Operation(summary = "获得个人签到统计")
-    @PreAuthenticated
-    public CommonResult<AppSignInRecordSummaryRespVO> getSignInRecordSummary() {
-        return success(signInRecordService.getSignInRecordSummary(getLoginUserId()));
-    }
-
-    @PostMapping("/create")
-    @Operation(summary = "签到")
-    @PreAuthenticated
-    public CommonResult<AppSignInRecordRespVO> createSignInRecord() {
-        SignInRecordDO recordDO = signInRecordService.createSignRecord(getLoginUserId());
-        return success(SignInRecordConvert.INSTANCE.coverRecordToAppRecordVo(recordDO));
-    }
-
-    @GetMapping("/page")
-    @Operation(summary = "获得签到记录分页")
-    @PreAuthenticated
-    public CommonResult<PageResult<AppSignInRecordRespVO>> getSignRecordPage(PageParam pageParam) {
-        PageResult<SignInRecordDO> pageResult = signInRecordService.getSignRecordPage(getLoginUserId(), pageParam);
-        return success(SignInRecordConvert.INSTANCE.convertPage02(pageResult));
-    }
+//    @GetMapping("/get-summary")
+//    @Operation(summary = "获得个人签到统计")
+//    @PreAuthenticated
+//    public CommonResult<AppSignInRecordSummaryRespVO> getSignInRecordSummary() {
+//        return success(signInRecordService.getSignInRecordSummary(getLoginUserId()));
+//    }
+//
+//    @PostMapping("/create")
+//    @Operation(summary = "签到")
+//    @PreAuthenticated
+//    public CommonResult<AppSignInRecordRespVO> createSignInRecord() {
+//        SignInRecordDO recordDO = signInRecordService.createSignRecord(getLoginUserId());
+//        return success(SignInRecordConvert.INSTANCE.coverRecordToAppRecordVo(recordDO));
+//    }
+//
+//    @GetMapping("/page")
+//    @Operation(summary = "获得签到记录分页")
+//    @PreAuthenticated
+//    public CommonResult<PageResult<AppSignInRecordRespVO>> getSignRecordPage(PageParam pageParam) {
+//        PageResult<SignInRecordDO> pageResult = signInRecordService.getSignRecordPage(getLoginUserId(), pageParam);
+//        return success(SignInRecordConvert.INSTANCE.convertPage02(pageResult));
+//    }
 
 }

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

@@ -23,7 +23,7 @@ public class TradeOrderTypeMq {
     public static final String PUBLISH_JOB_ORDER_TOPIC = "PUBLISH_JOB_ORDER_TOPIC";
 
     /** 发布众聘职位订单 **/
-    public static final String PUBLISH_JOB_HIRE_ORDER_TOPIC = "PUBLISH_JOB_HIRE_ORDER_TOPIC";
+    public static final String PUBLISH_JOB_HIRE_ORDER_TOPIC = "PUBLISH_JOB_ORDER_TOPIC";
 
     /** 用户会员套餐订单 **/
     public static final String USER_MEMBER_ORDER_TOPIC = "USER_MEMBER_ORDER_TOPIC";

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/admin/job/JobAdvertisedController.java

@@ -56,10 +56,10 @@ public class JobAdvertisedController {
     }
 
     @GetMapping("/page")
-    @Operation(summary = "获得全员猎聘职位分页")
+    @Operation(summary = "获得招聘职位分页")
     @PreAuthorize("@ss.hasPermission('menduner:system:job-advertised:query')")
     public CommonResult<PageResult<JobAdvertisedRespVO>> getJobAdvertisedPage(@Valid JobAdvertisedPageReqVO pageReqVO) {
-        PageResult<JobAdvertisedDO> pageResult = jobAdvertisedService.getHireJobPage(pageReqVO);
+        PageResult<JobAdvertisedDO> pageResult = jobAdvertisedService.getJobAdvertisedPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, JobAdvertisedRespVO.class));
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/enterprise/vo/EnterpriseSaveReqVO.java

@@ -70,6 +70,9 @@ public class EnterpriseSaveReqVO {
     @Schema(description = "是否筹备")
     private Boolean prepare;
 
+    @Schema(description = "营业执照照片")
+    private String businessUrl;
+
     @Schema(description = "允许企业发布哪些职位类型")
     private List<String> pubJobTypePerm;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/job/JobAdvertisedRespVO.java

@@ -120,4 +120,8 @@ public class JobAdvertisedRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("更新时间")
+    private LocalDateTime updateTime;
+
 }

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

@@ -59,7 +59,7 @@ public interface JobAdvertisedMapper extends BaseMapperX<JobAdvertisedDO> {
                 .eqIfPresent(JobAdvertisedDO::getHire, reqVO.isHire())
                 .eqIfPresent(JobAdvertisedDO::getStatus, reqVO.getStatus())
                 .betweenIfPresent(JobAdvertisedDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(JobAdvertisedDO::getId));
+                .orderByDesc(JobAdvertisedDO::getUpdateTime));
     }
 
     default List<JobAdvertisedDO> selectListByIds( List<Long> ids) {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/PublishJobConsumer.java

@@ -0,0 +1,38 @@
+package com.citu.module.menduner.system.mq.consumer;
+
+
+import com.citu.module.menduner.system.dal.dataobject.order.TradeOrderDO;
+import com.citu.module.menduner.system.enums.TradeOrderTypeMq;
+import com.citu.module.menduner.system.service.job.JobAdvertisedService;
+import com.citu.module.menduner.system.service.order.TradeOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 职位完成支付 消费
+ **/
+@Slf4j
+@Component
+@RocketMQMessageListener(
+        topic = TradeOrderTypeMq.PUBLISH_JOB_ORDER_TOPIC,
+        consumerGroup = TradeOrderTypeMq.PUBLISH_JOB_ORDER_TOPIC + "_CONSUMER"
+)
+public class PublishJobConsumer implements RocketMQListener<Long> {
+
+    @Resource
+    private TradeOrderService tradeOrderService;
+
+    @Resource
+    private JobAdvertisedService service;
+
+    @Override
+    public void onMessage(Long orderId) {
+        log.info("接收到队列消息[{}]", orderId);
+        TradeOrderDO order = tradeOrderService.getOrder(orderId);
+        service.enable(order.getSpuId());
+    }
+}

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/mq/consumer/PublishJobHireConsumer.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 
 /**
- * 众聘职位完成支付 消费
+ * 职位完成支付 消费
  **/
 @Slf4j
 @Component
@@ -33,6 +33,6 @@ public class PublishJobHireConsumer implements RocketMQListener<Long> {
     public void onMessage(Long orderId) {
         log.info("接收到队列消息[{}]", orderId);
         TradeOrderDO order = tradeOrderService.getOrder(orderId);
-        service.enableHire(order.getSpuId());
+        service.enable(order.getSpuId());
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/industry/IndustryServiceImpl.java

@@ -299,12 +299,6 @@ public class IndustryServiceImpl implements IndustryService {
         }
 
         List<IndustryDO> industryDOS = industryMapper.selectBatchIds(ids);
-//        List<IndustryDO> industryPaerntDOS = industryMapper.selectBatchIds(industryParentIds);
-//
-//        Map<Long, String> parentMap  = new HashMap<>();
-//        industryPaerntDOS.forEach(item->parentMap.put(item.getId(), item.getNameCn()));
-
-
         return industryDOS.stream().collect(Collectors.toMap(IndustryDO::getId, IndustryDO::getNameCn));
     }
-}//        Set<Long> industryParentIds = industryDOS.stream().map(IndustryDO::getParentId).collect(Collectors.toSet());
+}

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

@@ -156,9 +156,9 @@ public interface JobAdvertisedService {
     void enable(List<Long> ids);
 
     /**
-     * 开启职位(众聘职位使用)
+     * 开启职位(内部使用)
      **/
-    void enableHire(Long id);
+    void enable(Long id);
 
     /**
      * 关闭职位

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

@@ -39,7 +39,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -142,7 +141,7 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     @Override
     public PageResult<JobAdvertisedDO> getHireJobPage(JobAdvertisedPageReqVO page) {
         page.setEnterpriseId(DEFAULT_ENTERPRISE_ID);
-        page.setEnterpriseId(DEFAULT_USER_ID);
+        page.setUserId(DEFAULT_USER_ID);
         return mapper.selectPage(page);
     }
 
@@ -389,18 +388,13 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
             throw exception(MDE_JOB_ADVERTISED_NAME_DUPLICATE, job.getName());
         }
 
-        if (job.getId() == null) {
+        if (null == job.getId()) {
             // 新增职位
             processNewJob(job, enterpriseId, userId);
+            mapper.insert(job);
         } else {
             // 修改职位
             processExistingJob(job, enterpriseId, userId);
-        }
-
-        // 保存或更新职位信息
-        if (job.getId() == null) {
-            mapper.insert(job);
-        } else {
             mapper.updateById(job);
         }
 
@@ -415,35 +409,30 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
      * @param userId       用户ID
      */
     private void processNewJob(JobAdvertisedDO job, Long enterpriseId, Long userId) {
+
+        boolean triggerVip = !job.getHire() || JobStatusEnum.WAIT_ENABLE.getStatus().equals(job.getStatus());
         // 验证权益
-        vipEntitlementCheckAspect.validate(VipEntitlementCheck.OPERATE_PUBLISH_JOB, !job.getHire());
+        vipEntitlementCheckAspect.validate(VipEntitlementCheck.OPERATE_PUBLISH_JOB, triggerVip);
 
+        if (job.getHire() || JobStatusEnum.WAIT_ENABLE.getStatus().equals(job.getStatus())) {
+            // 众聘职位||待开启,还需要给钱才能开启
+            job.setStatus(JobStatusEnum.WAIT_ENABLE.getStatus());
+        } else {
+            //默认开启
+            job.setStatus(JobStatusEnum.ENABLE.getStatus());
+        }
 
         // 设置默认值
         job.setUserId(userId);
         job.setEnterpriseId(enterpriseId);
         job.setTop(false);
 
-        if (StringUtils.hasText(job.getStatus())) {
-            // 有保存状态则写入保存的状态
-            job.setStatus(job.getStatus());
-        } else {
-            if (!job.getHire()) {
-                // 不是众聘职位
-                job.setHirePrice(0L);
-                job.setStatus(JobStatusEnum.ENABLE.getStatus());
-            } else {
-                // 众聘职位新增后,还需要给钱才能开启
-                job.setStatus(JobStatusEnum.WAIT_ENABLE.getStatus());
-            }
-        }
-
         // 后置处理
         jobOperateAfter(job, SyncConstants.ADD);
 
         // 处理权益
         vipEntitlementCheckAspect
-                .process(VipEntitlementCheck.OPERATE_PUBLISH_JOB, VipEntitlementCheck.OperationType.DEDUCT, !job.getHire());
+                .process(VipEntitlementCheck.OPERATE_PUBLISH_JOB, VipEntitlementCheck.OperationType.DEDUCT, triggerVip);
     }
 
     /**
@@ -507,20 +496,15 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
     }
 
     @Override
-    public void enableHire(Long id) {
+    public void enable(Long id) {
         JobAdvertisedDO job = get(id);
         if (JobStatusEnum.ENABLE.getStatus().equals(job.getStatus())) {
             // 已经是开启状态
-            throw exception(MDE_JOB_ADVERTISED_STATUS_ENABLE_ERROR);
+            return;
         }
-        if (job.getHire()) {
-            // 众聘职位调用才处理
-            job.setStatus(JobStatusEnum.ENABLE.getStatus());
-            mapper.updateById(job);
-            jobDataSync(job, SyncConstants.UPDATE);
-        }
-
-
+        job.setStatus(JobStatusEnum.ENABLE.getStatus());
+        mapper.updateById(job);
+        jobDataSync(job, SyncConstants.UPDATE);
     }
 
     @Override