1、积分兑换增加上传单号

2、增加职位只能24小时内修改逻辑

citu-module-pay/citu-module-pay-biz/src/main/java/com/citu/module/pay/service/currency/PayCurrencyTransactionServiceImpl.java

@@ -34,7 +34,7 @@ public class PayCurrencyTransactionServiceImpl implements PayCurrencyTransaction
     /**
      * 货币账户流水的 no 前缀
      */
-    private static final String WALLET_NO_PREFIX = "W";
+    private static final String WALLET_NO_PREFIX = "M";
 
     @Resource
     private PayCurrencyService payCurrencyService;

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

@@ -303,7 +303,7 @@ public interface ErrorCodeConstants {
     ErrorCode MDE_JOB_ADVERTISED_STATUS_ENABLE_ERROR = new ErrorCode(1_100_025_014, "职位已开启,请勿重复操作");
     ErrorCode MDE_JOB_ADVERTISED_STATUS_CLOSE_ERROR = new ErrorCode(1_100_025_015, "职位已关闭,请勿重复操作");
 
-
+    ErrorCode MDE_JOB_ADVERTISED_TIME_ERROR_24 = new ErrorCode(1_100_025_016, "职位发布时间超出24小时,无法编辑");
     // ========== 企业招聘者浏览 1_100_026_000 ==========
     ErrorCode ENTERPRISE_USER_LOOK_NOT_EXISTS = new ErrorCode(1_100_026_001, "企业招聘者浏览不存在");
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/jobhunt/redeem/vo/AppRedeemRespVO.java

@@ -36,6 +36,9 @@ public class AppRedeemRespVO {
     @Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
     private String contactPhone;
 
+    @Schema(description = "订单号")
+    private String orderNo;
+
     @Schema(description = "状态", example = "1")
     private String status;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/recruit/job/vo/AppRecruitJobRespVO.java

@@ -16,4 +16,7 @@ public class AppRecruitJobRespVO extends AppRecruitJobSimpleRespVO {
 
     @Schema(description = "到期天数")
     private Long expireDay;
+
+    @Schema(description = "是否可编辑")
+    private boolean edit;
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/redeem/RedeemPageReqVO.java

@@ -42,6 +42,9 @@ public class RedeemPageReqVO extends PageParam {
     @Schema(description = "状态", example = "1")
     private String status;
 
+    @Schema(description = "订单号")
+    private String orderNo;
+
     @Schema(description = "备注", example = "随便")
     private String remark;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/redeem/RedeemRespVO.java

@@ -49,6 +49,10 @@ public class RedeemRespVO {
     @ExcelProperty("联系电话")
     private String contactPhone;
 
+    @Schema(description = "订单号")
+    @ExcelProperty("订单号")
+    private String orderNo;
+
     @Schema(description = "状态", example = "1")
     @ExcelProperty("状态")
     private String status;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/redeem/RedeemSaveReqVO.java

@@ -1,6 +1,7 @@
 package com.citu.module.menduner.system.controller.base.redeem;
 
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -45,6 +46,9 @@ public class RedeemSaveReqVO {
     @NotEmpty(message = "{1_100_049_006}")
     private String contactPhone;
 
+    @Schema(description = "订单号")
+    private String orderNo;
+
     @Schema(description = "状态", example = "1")
     private String status;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/redeem/RedeemDO.java

@@ -59,6 +59,10 @@ public class RedeemDO extends TenantBaseDO {
      * 联系电话
      */
     private String contactPhone;
+    /**
+     * 订单号
+     */
+    private String orderNo;
     /**
      * 状态
      */

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/redeem/RedeemMapper.java

@@ -27,6 +27,7 @@ public interface RedeemMapper extends BaseMapperX<RedeemDO> {
                 .likeIfPresent(RedeemDO::getContactPhone, reqVO.getContactPhone())
                 .eqIfPresent(RedeemDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(RedeemDO::getRemark, reqVO.getRemark())
+                .eqIfPresent(RedeemDO::getOrderNo, reqVO.getOrderNo())
                 .betweenIfPresent(RedeemDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(RedeemDO::getId));
     }

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

@@ -43,6 +43,7 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -450,7 +451,11 @@ public class JobAdvertisedServiceImpl implements JobAdvertisedService {
                 }
             }
         }
-
+        // 如果发布职位的job.createTime超过了24小时则不可编辑,respVO.setEdit(false);
+        if (JobStatusEnum.ENABLE.getStatus().equals(existingJob.getStatus())
+                &&ChronoUnit.HOURS.between(existingJob.getCreateTime(), LocalDateTime.now()) > 24) {
+            throw exception(MDE_JOB_ADVERTISED_TIME_ERROR_24);
+        }
         // 如果普通职位切换成众聘职位
         if (job.getHire() && !existingJob.getHire()) {
             job.setStatus(JobStatusEnum.WAIT_ENABLE.getStatus());

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

@@ -35,6 +35,7 @@ import com.citu.module.menduner.system.dal.mysql.job.JobCvRelMapper;
 import com.citu.module.menduner.system.dal.mysql.major.MajorMapper;
 import com.citu.module.menduner.system.dal.mysql.position.PositionMapper;
 import com.citu.module.menduner.system.dal.mysql.unfit.UnfitCandidateMapper;
+import com.citu.module.menduner.system.enums.job.JobStatusEnum;
 import com.citu.module.menduner.system.service.area.AreaService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.interview.InterviewInviteService;
@@ -60,6 +61,9 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_ADVERTISED_BALANCE_UPDATE;
+
 @Slf4j
 @Service
 @Validated
@@ -317,6 +321,14 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
             if (null != job.getExpireTime()) {
                 respVO.setExpireDay(ChronoUnit.DAYS.between(LocalDateTime.now(), respVO.getExpireTime()));
             }
+            // 如果发布职位的job.createTime超过了24小时则不可编辑,respVO.setEdit(false);
+            if (JobStatusEnum.ENABLE.getStatus().equals(job.getStatus())
+                    &&ChronoUnit.HOURS.between(job.getCreateTime(), LocalDateTime.now()) > 24) {
+                respVO.setEdit(false);
+            }else {
+                respVO.setEdit(true);
+            }
+
             list.add(respVO);
 
         });

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/redeem/RedeemService.java

@@ -54,6 +54,8 @@ public interface RedeemService {
      */
     PageResult<RedeemDO> getRedeemPage(RedeemPageReqVO pageReqVO);
 
+
+
     // ========== 求职端 ==========
     /** 兑换 **/
     void submit(AppRedeemSubmitReqVO reqVO);

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

@@ -224,6 +224,7 @@
 1_100_025_013=The expiration time cannot be less than the current time
 1_100_025_014=Position has been opened, please do not repeat the operation
 1_100_025_015=Position closed, please do not repeat operation
+1_100_025_016=Position posting time exceeds 24 hours, unable to edit
 # ========== 企业招聘者浏览 1_100_026_000 ==========
 1_100_026_001=Enterprise recruiter browsing does not exist
 # ========== 人才-企业关注订阅 1_100_027_000 ==========

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

@@ -224,6 +224,7 @@
 1_100_025_013=The expiration time cannot be less than the current time
 1_100_025_014=Position has been opened, please do not repeat the operation
 1_100_025_015=Position closed, please do not repeat operation
+1_100_025_016=Position posting time exceeds 24 hours, unable to edit
 # ========== 企业招聘者浏览 1_100_026_000 ==========
 1_100_026_001=Enterprise recruiter browsing does not exist
 # ========== 人才-企业关注订阅 1_100_027_000 ==========

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

@@ -224,6 +224,7 @@
 1_100_025_013=到期时间不能小于当前时间
 1_100_025_014=职位已开启,请勿重复操作
 1_100_025_015=职位已关闭,请勿重复操作
+1_100_025_016=职位发布时间超出24小时,无法编辑
 # ========== 企业招聘者浏览 1_100_026_000 ==========
 1_100_026_001=企业招聘者浏览不存在
 # ========== 人才-企业关注订阅 1_100_027_000 ==========