系统判断配送限制

server/dukang-api/src/modules/settlement/settlement.service.ts

@@ -1172,7 +1172,12 @@ export class SettlementService {
           ok: true,
           skipped: Boolean(bill.skipped),
           message: bill.reason,
-          billId: bill.bill?.id?.toString?.() ?? bill.bill?.id,
+          billId:
+            bill.bill?.id != null
+              ? typeof bill.bill.id === 'string'
+                ? bill.bill.id
+                : String(bill.bill.id)
+              : undefined,
         });
       } catch (e) {
         results.push({
@@ -1419,7 +1424,23 @@ export class SettlementService {
       orderBy: { code: 'asc' },
     });
 
-    const rows = [];
+    const rows: Array<{
+      providerId: string;
+      providerCode: string;
+      providerName: string;
+      settlementMethod: string;
+      prepaidBalance: number;
+      bankAccountName: string | null;
+      bankName: string | null;
+      bankAccountNo: string | null;
+      pricingRules: ReturnType<FulfillmentProviderService['parsePricingRules']>;
+      orderCount: number;
+      bottleCount: number;
+      logisticsAmount: number;
+      billId: string | null;
+      billStatus: string | null;
+      billAmount: number | null;
+    }> = [];
     for (const p of providers) {
       const pricing =
         this.fulfillmentProviderService.parsePricingRules(p.pricingRulesJson) ??