Jelajahi Sumber

将邀约响应状态改为与事件状态一致。

Co-authored-by: Cursor <cursoragent@cursor.com>
fuyuchuan 4 hari lalu
induk
melakukan
f5be29dca2

+ 2 - 1
service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/constant/VppDrEventStatus.java

@@ -1,7 +1,8 @@
 package com.usky.vpp.constant;
 
 /**
- * 需求响应事件状态:0待参与 1已申报 2申报完成 3执行中 4已结束 5已取消
+ * 需求响应事件 / 邀约响应状态:0待参与 1已申报 2申报完成 3执行中 4已结束 5已取消
+ * <p>vpp_dr_event.event_status 与 vpp_dr_invitation.response_status 共用同一套取值。</p>
  */
 public final class VppDrEventStatus {
 

+ 3 - 0
service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/controller/web/DrController.java

@@ -159,6 +159,9 @@ public class DrController {
         return ApiResult.success();
     }
 
+    /**
+     * 邀约响应状态:0待参与 1已申报 2申报完成 3执行中 4已结束 5已取消(与事件状态一致)
+     */
     @GetMapping(value = "/invitation")
     public ApiResult<CommonPage<DrInvitationVO>> pageInvitation(@RequestParam(required = false) Map<String, Object> params) {
         return ApiResult.success(vppDrInvitationService.pageInvitation(params));

+ 1 - 0
service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/domain/VppDrInvitation.java

@@ -68,6 +68,7 @@ public class VppDrInvitation implements Serializable {
     private Integer isWinningBid;
     @TableField("reply_status")
     private Integer replyStatus;
+    /** 0待参与 1已申报 2申报完成 3执行中 4已结束 5已取消 */
     @TableField("response_status")
     private Integer responseStatus;
     @TableField("sms_notify_status")

+ 6 - 4
service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/impl/VppDrInvitationServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.core.exception.BusinessException;
 import com.usky.vpp.config.VppSmsProperties;
+import com.usky.vpp.constant.VppDrEventStatus;
 import com.usky.vpp.domain.VppCustomer;
 import com.usky.vpp.domain.VppCustomerContact;
 import com.usky.vpp.domain.VppDrEvent;
@@ -56,9 +57,10 @@ public class VppDrInvitationServiceImpl implements VppDrInvitationService {
     private static final int REPLY_REJECT = 2;
     private static final int REPLY_TIMEOUT = 3;
 
-    private static final int RESPONSE_PENDING = 0;
-    private static final int RESPONSE_DECLARED = 1;
-    private static final int RESPONSE_CANCELLED = 4;
+    /** 与事件状态一致:0待参与 1已申报 2申报完成 3执行中 4已结束 5已取消 */
+    private static final int RESPONSE_PENDING = VppDrEventStatus.PENDING;
+    private static final int RESPONSE_DECLARED = VppDrEventStatus.DECLARED;
+    private static final int RESPONSE_CANCELLED = VppDrEventStatus.CANCELLED;
 
     private static final int SMS_NOT_SENT = 0;
     private static final int SMS_SENT = 1;
@@ -208,7 +210,7 @@ public class VppDrInvitationServiceImpl implements VppDrInvitationService {
             throw new BusinessException("已参与的邀约不可删除");
         }
         if (invitation.getResponseStatus() != RESPONSE_PENDING) {
-            throw new BusinessException("仅待响应状态的邀约可删除");
+            throw new BusinessException("仅待参与状态的邀约可删除");
         }
         if (invitation.getParticipationId() != null) {
             throw new BusinessException("邀约已关联参与记录,不可删除");

+ 1 - 0
service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/vo/DrInvitationVO.java

@@ -39,6 +39,7 @@ public class DrInvitationVO {
     /** 是否中标 0否 1是 */
     private Integer isWinningBid;
     private Integer replyStatus;
+    /** 0待参与 1已申报 2申报完成 3执行中 4已结束 5已取消 */
     private Integer responseStatus;
     private Integer smsNotifyStatus;
     private LocalDateTime smsNotifyAt;

+ 1 - 1
service-vpp/service-vpp-biz/src/main/resources/sql/vpp_schema.sql

@@ -509,7 +509,7 @@ CREATE TABLE `vpp_dr_invitation` (
     `response_completion_rate` DECIMAL(12,4) NULL COMMENT '响应完成率=实际响应容量/邀约规模',
     `is_winning_bid` TINYINT NULL COMMENT '是否中标 0否 1是',
     `reply_status` TINYINT NOT NULL COMMENT '0待回复 1参与 2拒绝 3超时',
-    `response_status` TINYINT NOT NULL COMMENT '0待响应 1已申报 2执行中 3已结束 4已取消',
+    `response_status` TINYINT NOT NULL COMMENT '0待参与 1已申报 2申报完成 3执行中 4已结束 5已取消',
     `sms_notify_status` TINYINT NOT NULL DEFAULT 0 COMMENT '0未发送 1已发送 2发送失败',
     `sms_notify_at` DATETIME(3) NULL COMMENT '短信通知时间',
     `sms_contact_id` BIGINT NULL COMMENT '通知联系人ID',