fix: enforce carrier-specific channel group routing

api/src/send-chain/send-chain.service.ts

@@ -464,7 +464,7 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
     }
     try {
       const routed = await this.selectChannelForMessage(message);
-      return this.submitMessageToGateway(message, routed, 0);
+      return await this.submitMessageToGateway(message, routed, 0);
     } catch (error) {
       const reason = error instanceof Error ? error.message : '无可用通道组或通道';
       await this.prisma.smsMessageRecord.update({
@@ -491,6 +491,9 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
         submittedAt,
       },
     });
+    if (data.submitId && message.submitId && data.submitId !== message.submitId) {
+      return this.prisma.smsMessageRecord.findUnique({ where: { id: message.id } });
+    }
     const status = data.submitStatus === 'accepted' ? 'submitted' : data.submitStatus === 'timeout' ? 'timeout' : 'submit_failed';
     if (data.submitStatus === 'accepted') {
       await this.chargeAcceptedMessage(message);
@@ -538,6 +541,12 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
         deliveredAt,
       },
     });
+    const isCurrentAttempt =
+      (!message.channelId || message.channelId === data.channelId)
+      && (!message.gatewayMessageId || message.gatewayMessageId === data.gatewayMessageId);
+    if (!isCurrentAttempt || (status === 'failed' && message.status === 'delivered')) {
+      return this.prisma.smsMessageRecord.findUnique({ where: { id: message.id } });
+    }
     if (status === 'failed') {
       const retried = await this.retryMessageIfAllowed(message, '回执失败补发');
       if (retried) {
@@ -619,12 +628,13 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
       phoneNumber: string;
       content: string;
       billingUnits: number;
-      template?: { signature?: { name?: string | null } | null } | null;
+      template?: { signature?: { id?: string | null; name?: string | null } | null } | null;
     },
     routed: RoutedChannel,
     attempt: number,
   ) {
     const channel = routed.channel;
+    await this.ensureSignatureReportedForChannel(message, channel.id);
     await this.waitForChannelRateLimit(channel.id, channel.rateLimitPerSecond);
     const submitId = `SUB-${randomUUID()}`;
     const session = await this.prisma.cmppSubmitSession.upsert({
@@ -733,7 +743,7 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
         where: { id: message.id },
         data: { errorMessage: reason },
       });
-      return this.submitMessageToGateway(message, routed, attempts.length);
+      return await this.submitMessageToGateway(message, routed, attempts.length);
     } catch {
       return null;
     }
@@ -750,7 +760,11 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
     const route = await this.findApplicationRoute(message.tenantId, message.applicationId, carrier);
     const province = await this.identifyProvince(message.phoneNumber);
     const excluded = new Set(options.excludeChannelIds ?? []);
-    const items = route.group.items.filter((item) => !excluded.has(item.channelId) && isCarrierCompatible(item.channel.carrier, carrier));
+    const items = route.group.items.filter((item) =>
+      !excluded.has(item.channelId)
+      && normalizeCarrier(item.carrier) === carrier
+      && isCarrierCompatible(item.channel.carrier, carrier),
+    );
     const provinceCandidates = options.forceNational ? [] : items.filter((item) => isProvinceChannel(item, province));
     const nationalCandidates = items.filter((item) => isNationalChannel(item));
     const selected = [...provinceCandidates, ...nationalCandidates].find((item) => this.isChannelSendAvailable(item.channel));
@@ -785,6 +799,9 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
     if (route.group.status !== 'active') {
       throw new BadRequestException('企业应用绑定的通道组已停用');
     }
+    if (normalizeCarrier(route.group.carrier) !== carrier) {
+      throw new BadRequestException('企业应用绑定的通道组运营商与路由规则不一致');
+    }
     return route;
   }
 
@@ -826,17 +843,17 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
   }
 
   private async resolveUnitPrice(tenantId: string, applicationId?: string) {
-    try {
-      const route = await this.prisma.channelRouteRule.findFirst({
-        where: { tenantId, applicationId, status: 'active', channelId: null },
-        include: { group: { include: { items: { include: { channel: true }, orderBy: { priority: 'asc' } } } } },
-        orderBy: { priority: 'asc' },
-      });
-      const channel = route?.group.items.find((item) => item.channel.status === 'active')?.channel;
-      return channel?.unitPrice ?? 0;
-    } catch {
+    if (!applicationId) {
       return 0;
     }
+    const application = await this.prisma.smsApplication.findUnique({
+      where: { id: applicationId },
+      select: { tenantId: true, customerUnitPrice: true },
+    });
+    if (!application || application.tenantId !== tenantId) {
+      return 0;
+    }
+    return application.customerUnitPrice ?? 0;
   }
 
   private async validateSendResources(tenantId: string, applicationId?: string, templateId?: string) {
@@ -935,12 +952,18 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
     if (charged) {
       return;
     }
+    const released = await this.prisma.accountTransaction.findFirst({
+      where: { relatedType: 'sms_message_record', relatedId: message.messageId, transactionType: 'released' },
+    });
+    if (released) {
+      return;
+    }
     await this.billing.release({
       tenantId: message.tenantId,
       amountCents: message.amountCents,
       smsUnits: message.billingUnits,
-      relatedType: 'sms_batch_task',
-      relatedId: message.batchTaskId,
+      relatedType: 'sms_message_record',
+      relatedId: message.messageId,
       remark: `${remark}: ${message.messageId}`,
     });
   }
@@ -952,6 +975,14 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
     if ((message.amountCents ?? 0) + (message.billingUnits ?? 0) <= 0) {
       return;
     }
+    const refunded = await this.prisma.smsBillingRecord.findFirst({ where: { messageId: message.messageId, billingStatus: 'refunded' } });
+    if (refunded) {
+      return;
+    }
+    const charged = await this.prisma.smsBillingRecord.findFirst({ where: { messageId: message.messageId, billingStatus: 'charged' } });
+    if (!charged) {
+      return;
+    }
     const transaction = await this.billing.refund({
       tenantId: message.tenantId,
       amountCents: message.amountCents,
@@ -966,6 +997,34 @@ export class SendChainService implements OnModuleInit, OnModuleDestroy {
     });
   }
 
+  private async ensureSignatureReportedForChannel(
+    message: {
+      id: string;
+      templateId?: string | null;
+      template?: { signature?: { id?: string | null; name?: string | null } | null } | null;
+    },
+    channelId: string,
+  ) {
+    let signatureId = message.template?.signature?.id ?? null;
+    if (!signatureId && message.templateId) {
+      const template = await this.prisma.smsTemplate.findUnique({
+        where: { id: message.templateId },
+        include: { signature: true },
+      });
+      signatureId = template?.signature?.id ?? null;
+    }
+    if (!signatureId) {
+      throw new BadRequestException('短信签名未配置，不能提交到通道');
+    }
+    const reportTask = await this.prisma.channelSignatureReportTask.findFirst({
+      where: { signatureId, channelId, status: 'approved' },
+      select: { id: true },
+    });
+    if (!reportTask) {
+      throw new BadRequestException('短信签名未在最终通道报备通过');
+    }
+  }
+
   private async waitForChannelRateLimit(channelId: string, tps: number) {
     const redis = this.getRedis();
     for (;;) {