From c147ef602f896f855ad50cc34e259caa0720c01e Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Mon, 20 Apr 2026 11:13:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B6=88=E6=81=AF=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E9=98=9F=E5=88=97delete=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/message/vo/MessageRecordReqVO.java     | 6 ------
 .../dal/mysql/retry/mapping/MessageRetryQueueMapper.xml     | 2 --
 2 files changed, 8 deletions(-)

diff --git a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/controller/admin/message/vo/MessageRecordReqVO.java b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/controller/admin/message/vo/MessageRecordReqVO.java
index a143c85..2b37ee9 100644
--- a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/controller/admin/message/vo/MessageRecordReqVO.java
+++ b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/controller/admin/message/vo/MessageRecordReqVO.java
@@ -16,9 +16,6 @@ import lombok.Data;
 @Data
 @Schema(description = "管理后台 - 消息记录发送 Request VO")
 public class MessageRecordReqVO extends PageParam {
-    @Schema(description = "主键ID")
-    private Long id;
-
     @Schema(description = "渠道类型：sms/email/app", example = "sms")
     @InEnum(value = com.njcn.msgpush.module.push.enums.ChannelTypeEnum.class, message = "渠道类型必须是 {value}")
     private String channel;
@@ -43,7 +40,4 @@ public class MessageRecordReqVO extends PageParam {
 
     @Schema(description = "模板参数")
     private String templateParams;
-
-    @Schema(description = "第三方消息ID")
-    private String thirdPartyId;
 }
diff --git a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/mysql/retry/mapping/MessageRetryQueueMapper.xml b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/mysql/retry/mapping/MessageRetryQueueMapper.xml
index c21c22f..6b455d6 100644
--- a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/mysql/retry/mapping/MessageRetryQueueMapper.xml
+++ b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/mysql/retry/mapping/MessageRetryQueueMapper.xml
@@ -7,7 +7,6 @@
         FROM push_message_retry_queue
         WHERE channel = #{channel}
           AND next_retry_time  <![CDATA[ <= ]]>  #{currentTime}
-          AND deleted = 0
           AND (
             process_status = 0
             OR process_status IS NULL
@@ -24,7 +23,6 @@
             lock_until = #{lockUntil}
         WHERE message_id = #{messageId}
           AND channel = #{channel}
-          AND deleted = 0
           AND next_retry_time <![CDATA[ <= ]]> #{currentTime}
           AND (
             process_status = 0