优化

finance/src/test/java/com/baiyue/finance/FinanceFeePoolDirectionBehaviorTest.java

@@ -36,7 +36,7 @@ class FinanceFeePoolDirectionBehaviorTest {
 
         assertThat(result).isNotEmpty().allMatch(item -> "PAYABLE".equals(item.direction()));
         assertThat(jdbc.sourceDirections).containsExactly("PAYABLE");
-        assertThat(jdbc.costQueryCount).isEqualTo(1);
+        assertThat(jdbc.costQueryCount).isZero();
     }
 
     private static final class DirectionJdbc extends JdbcTemplate {
@@ -60,7 +60,8 @@ class FinanceFeePoolDirectionBehaviorTest {
 
         private static FeePoolItem item(String direction, String sourceType, long sourceId) {
             return new FeePoolItem(direction + ":" + sourceId, 7L, direction, sourceType, sourceId, 1,
-                11L, 21L, null, "清关费", new BigDecimal("100.00"), "CNY", "AVAILABLE",
+                11L, 21L, null, "清关费", new BigDecimal("100.00"), "CNY",
+                "PAYABLE".equals(direction) ? "ON_ACCOUNT" : null, null, null, null, List.of(), "AVAILABLE",
                 LocalDateTime.of(2026, 8, 11, 1, 0));
         }
     }

finance/src/test/java/com/baiyue/finance/FinanceFeeSourceEventServiceTest.java

@@ -70,7 +70,8 @@ class FinanceFeeSourceEventServiceTest {
         givenNewEvent();
         var snapshot = new FirstlegFeeSourceClient.Snapshot(7, "CONTAINER_FEE", 31, 1,
             null, null, null, 41L, 61L, "C-41", 7, "客户", 71L, "现有供应商",
-            "TRUCKING", 61L, "TRUCKING", "拖车费", "PAYABLE", LocalDate.of(2026, 8, 11),
+            "TRUCKING", "ON_ACCOUNT", null, null, null, List.of(),
+            61L, "TRUCKING", "拖车费", "PAYABLE", LocalDate.of(2026, 8, 11),
             "CNY", new BigDecimal("300.00"), "APPROVED", "PUBLISHED",
             LocalDateTime.of(2026, 8, 11, 1, 0), null, null, null, null,
             "source-hash-payable", 1);
@@ -81,7 +82,7 @@ class FinanceFeeSourceEventServiceTest {
         verify(supplierValidator).requireActive(71L, "TRUCKING");
         ArgumentCaptor<Object[]> values = ArgumentCaptor.forClass(Object[].class);
         verify(jdbc).update(startsWith("INSERT INTO fin_fee_source"), values.capture());
-        assertThat(values.getValue()[14].toString())
+        assertThat(values.getValue()[19].toString())
             .contains("\"supplierId\":71", "\"supplierName\":\"现有供应商\"", "\"supplierCategory\":\"TRUCKING\"");
     }
 
@@ -91,7 +92,8 @@ class FinanceFeeSourceEventServiceTest {
         givenNewEvent();
         var snapshot = new FirstlegFeeSourceClient.Snapshot(7, "CONTAINER_FEE", 31, 1,
             null, null, null, 41L, 61L, "C-41", 7, "客户", 71L, "现有供应商",
-            null, 61L, "STORAGE", "仓储费", "PAYABLE", LocalDate.of(2026, 8, 11),
+            null, "ON_ACCOUNT", null, null, null, List.of(),
+            61L, "STORAGE", "仓储费", "PAYABLE", LocalDate.of(2026, 8, 11),
             "CNY", new BigDecimal("300.00"), "APPROVED", "PUBLISHED",
             LocalDateTime.of(2026, 8, 11, 1, 0), null, null, null, null,
             "source-hash-unrestricted", 1);
@@ -101,6 +103,28 @@ class FinanceFeeSourceEventServiceTest {
         verify(supplierValidator).requireActive(71L, null);
     }
 
+    @Test
+    void importsDirectPaidSnapshotWithoutTreatingItAsOnAccount() {
+        FinanceFeeSourceEvent event = containerEvent("container-direct-paid-1", "FIRSTLEG_FEE_PUBLISHED", 1, 7);
+        givenNewEvent();
+        var snapshot = new FirstlegFeeSourceClient.Snapshot(7, "CONTAINER_FEE", 31, 1,
+            null, null, null, 41L, 61L, "C-41", 7, "客户", 71L, "现有供应商",
+            "TRUCKING", "DIRECT_PAID", LocalDateTime.of(2026, 8, 11, 10, 0),
+            "BANK_TRANSFER", "BANK-001", List.of(901L), 61L, "TRUCKING", "拖车费",
+            "PAYABLE", LocalDate.of(2026, 8, 11), "CNY", new BigDecimal("300.00"),
+            "APPROVED", "PUBLISHED", LocalDateTime.of(2026, 8, 11, 11, 0),
+            null, null, null, null, "source-hash-direct", 1);
+        when(firstleg.container("test-token", 41, 31, 1)).thenReturn(ApiResponse.success(snapshot));
+
+        assertThat(service.consume(event)).isEqualTo(101L);
+
+        ArgumentCaptor<Object[]> values = ArgumentCaptor.forClass(Object[].class);
+        verify(jdbc).update(startsWith("INSERT INTO fin_fee_source"), values.capture());
+        assertThat(values.getValue()[13]).isEqualTo("DIRECT_PAID");
+        assertThat(values.getValue()[15]).isEqualTo("BANK_TRANSFER");
+        assertThat(values.getValue()[17]).isEqualTo("[901]");
+    }
+
     @Test
     void adjustmentCreatesNewImmutableVersionAndSupersedesAvailableVersion() {
         FinanceFeeSourceEvent event = inboundEvent("adjusted-2", "FIRSTLEG_FEE_ADJUSTED", 2, 7);
@@ -216,7 +240,8 @@ class FinanceFeeSourceEventServiceTest {
                                                        String publicationStatus, BigDecimal amount) {
         return new FirstlegFeeSourceClient.Snapshot(customerId, sourceType, 31, version, inboundId,
             inboundId == null ? null : "IB-21", 51L, containerId, null,
-            containerId == null ? null : "C-41", customerId, "客户", null, null, null, 61L, "CUSTOMS",
+            containerId == null ? null : "C-41", customerId, "客户", null, null, null,
+            null, null, null, null, List.of(), 61L, "CUSTOMS",
             "清关费", "RECEIVABLE", LocalDate.of(2026, 8, 11), "CNY", amount,
             "APPROVED", publicationStatus, LocalDateTime.of(2026, 8, 11, 1, 0),
             BigDecimal.ONE, "SHIPMENT", BigDecimal.TEN, BigDecimal.ONE, "source-hash", version);

finance/src/test/java/com/baiyue/finance/FinanceFeeSourceMigrationContractTest.java

@@ -14,6 +14,8 @@ class FinanceFeeSourceMigrationContractTest {
         String sql = Files.readString(Path.of("src/main/resources/db/fee-source-event-migration.sql"), StandardCharsets.UTF_8);
         assertThat(sql).contains("information_schema.columns", "source_type", "direction", "container_id",
             "source_hash", "source_snapshot", "payload_hash", "result_resource_id", "error_code");
+        assertThat(sql).contains("settlement_mode", "paid_at", "payment_method",
+            "payment_reference_no", "payment_voucher_file_ids");
         assertThat(sql).contains("AVAILABLE可结算", "SUPERSEDED已被新版本替代", "VOIDED已作废");
         assertThat(sql).contains("finance_fee_source_assert_schema");
     }

finance/src/test/java/com/baiyue/finance/FinancePlatformListContractTest.java

@@ -68,7 +68,8 @@ class FinancePlatformListContractTest {
     void allCustomerFeePoolResponseCarriesCustomerIdentity() {
         assertThat(Arrays.stream(com.baiyue.finance.dto.FinanceReadModels.FeePoolItem.class
             .getRecordComponents()).map(java.lang.reflect.RecordComponent::getName))
-            .contains("customerId");
+            .contains("customerId", "settlementMode", "paidAt", "paymentMethod",
+                "paymentReferenceNo", "paymentVoucherFileIds");
     }
 
     @Test

finance/src/test/java/com/baiyue/finance/FinanceSettlementBehaviorTest.java

@@ -396,6 +396,22 @@ class FinanceSettlementBehaviorTest {
         verify(jdbc, never()).update(any(PreparedStatementCreator.class), any(KeyHolder.class));
     }
 
+    @Test
+    void directPaidSourceCannotEnterPayableSettlement() {
+        JdbcTemplate jdbc = org.mockito.Mockito.mock(JdbcTemplate.class);
+        when(jdbc.queryForList(startsWith("SELECT request_hash"), eq(10L), eq(7L),
+            eq("SETTLEMENT_AP_CREATE"), eq("ap-direct"))).thenReturn(List.of());
+        Map<String, Object> source = payableSource(10L, 20L);
+        source.put("settlement_mode", "DIRECT_PAID");
+        when(jdbc.queryForList(startsWith("SELECT id,customer_id"), eq(31L))).thenReturn(List.of(source));
+        FinanceSettlementService service = service(jdbc, org.mockito.Mockito.mock(FinanceFileClient.class));
+
+        assertCode(() -> service.createPayableSettlement(7L, "ap-direct",
+            new CreatePayableSettlementRequest(10L, 20L, List.of(31L),
+                LocalDate.of(2026, 9, 30), "CNY")), "FIN_409");
+        verify(jdbc, never()).update(startsWith("INSERT INTO fin_settlement"), any(Object[].class));
+    }
+
     @Test
     void payableCreationRejectsMixedSupplierIneligibleAndOccupiedSources() {
         for (String condition : List.of("supplier", "ineligible", "occupied")) {
@@ -649,6 +665,7 @@ class FinanceSettlementBehaviorTest {
             Map.entry("id", 31L), Map.entry("customer_id", customerId), Map.entry("direction", "PAYABLE"),
             Map.entry("currency_code", "CNY"), Map.entry("status", "AVAILABLE"),
             Map.entry("amount", new BigDecimal("100.00")), Map.entry("review_status", "APPROVED"),
+            Map.entry("settlement_mode", "ON_ACCOUNT"),
             Map.entry("supplier_id", supplierId),
             Map.entry("fee_item_code", "FBA_HEAD_FREIGHT"), Map.entry("fee_item_name", "头程运费"),
             Map.entry("supplier_name", "供应商20"), Map.entry("source_snapshot",

finance/src/test/java/com/baiyue/finance/FinanceSqlCommentContractTest.java

@@ -44,7 +44,7 @@ class FinanceSqlCommentContractTest {
             }
         }
         assertThat(tableCount).isEqualTo(17);
-        assertThat(columnCount).isEqualTo(243);
+        assertThat(columnCount).isEqualTo(248);
         assertThat(missing).as("缺少中文业务注释的Finance字段").isEmpty();
     }
 
@@ -55,6 +55,7 @@ class FinanceSqlCommentContractTest {
         assertThat(sql).contains("AVAILABLE可结算、SUPERSEDED已被新版本替代、VOIDED已作废");
         assertThat(sql).contains("RECEIVED已接收、PROCESSED已完成、FAILED处理失败");
         assertThat(sql).contains("Firstleg费用来源完整不可变JSON快照");
+        assertThat(sql).contains("ON_ACCOUNT账期应付、DIRECT_PAID业务已付");
         assertThat(sql).contains("规范化完整请求的SHA-256十六进制哈希");
     }