fix: close receipt delivery workflows

2026-07-24 14:40:57 +08:00
parent 2ee39056eb
commit 91f04f5288
22 changed files with 829 additions and 48 deletions
@@ -1868,7 +1868,13 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
    }
    const application = await this.prisma.smsApplication.findUnique({
      where: { id: data.applicationId },
-      select: { cmppAccount: true, downstreamReceiptRetryEnabled: true, downstreamUplinkRetryEnabled: true, httpConfig: true },
+      select: {
+        cmppAccount: true,
+        interfaceEnabled: true,
+        downstreamReceiptRetryEnabled: true,
+        downstreamUplinkRetryEnabled: true,
+        httpConfig: true,
+      },
    });
    try {
      await this.openApi?.queueWebhookEvent({
@@ -1883,10 +1889,7 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
    } catch (error) {
      this.logger.error(`HTTP webhook queue failed for ${data.deliveryType}/${data.messageId ?? '-'}: ${error instanceof Error ? error.message : String(error)}`);
    }
-    const deliveryMode = data.deliveryType === 'receipt'
-      ? application?.httpConfig?.receiptDeliveryMode ?? 'cmpp'
-      : application?.httpConfig?.uplinkDeliveryMode ?? 'cmpp';
-    if (!['cmpp', 'both'].includes(deliveryMode)) {
+    if (application?.interfaceEnabled !== true) {
      return null;
    }
    const payload = { account: application?.cmppAccount, applicationId: data.applicationId, ...data.payload };
@@ -3833,6 +3836,24 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
      ? await this.prisma.smsMessageRecord.findUnique({ where: { messageId: data.messageId } })
      : null;
    if (exactMessage) {
+      const segmentAudit = data.gatewayMessageId
+        ? await this.smsMessageSegmentAuditDelegate().findFirst({
+            where: {
+              messageRecordId: exactMessage.id,
+              gatewayMessageId: data.gatewayMessageId,
+            },
+            orderBy: { updatedAt: 'desc' },
+          })
+        : null;
+      if (segmentAudit) {
+        return {
+          message: exactMessage,
+          messageId: exactMessage.messageId,
+          submitRecordId: segmentAudit.submitRecordId ?? undefined,
+          submitId: segmentAudit.submitId,
+          channelId: segmentAudit.channelId ?? data.channelId,
+        };
+      }
      const submitRecord = await this.prisma.smsSubmitRecord.findFirst({
        where: {
          messageRecordId: exactMessage.id,