优化

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

@@ -52,12 +52,16 @@ class FinancePhase1OperationBehaviorTest {
 
         controller.listDerivedCustomerAccounts(1, 20, "柏悦", "ACTIVE", 9L);
         controller.listDerivedCustomerAccountLedger(9L, 2, 50, "RECEIPT", LocalDate.of(2026, 8, 1), LocalDate.of(2026, 8, 31));
+        controller.listFinanceFeeSources(1, 20, 9L, "RECEIVABLE", "AVAILABLE", "APPROVED", true,
+            false, LocalDate.of(2026, 8, 1), LocalDate.of(2026, 8, 31), "IN-9");
         controller.getFinanceFeeSource(88L);
         controller.reviewFinanceFeeSource(user, 88L, "review-key", review);
         controller.updateFeeSourceSettlementInclusion(user, 88L, "include-key", inclusion);
 
         verify(customerAccountService).list(1, 20, "柏悦", "ACTIVE", 9L);
         verify(operationService).listDerivedCustomerAccountLedger(eq(9L), eq(2), eq(50), eq("RECEIPT"), any(), any());
+        verify(operationService).listFinanceFeeSources(eq(1), eq(20), eq(9L), eq("RECEIVABLE"),
+            eq("AVAILABLE"), eq("APPROVED"), eq(true), eq(false), any(), any(), eq("IN-9"));
         verify(operationService).getFinanceFeeSource(88L);
         verify(operationService).reviewFinanceFeeSource(88L, 71L, "review-key", review);
         verify(operationService).updateFeeSourceSettlementInclusion(88L, 71L, "include-key", inclusion);
@@ -112,6 +116,59 @@ class FinancePhase1OperationBehaviorTest {
         assertThat(jdbc.ledgerCustomerIds).containsExactly(9L, 9L, 9L);
     }
 
+    @Test
+    void feeSourceListUsesFormalFieldsAndAllActiveFilters() throws Exception {
+        JdbcTemplate jdbc = mock(JdbcTemplate.class);
+        when(jdbc.queryForObject(startsWith("SELECT COUNT(*) FROM fin_fee_source"), eq(Long.class), any(Object[].class)))
+            .thenReturn(1L);
+        when(jdbc.query(startsWith("SELECT f.*"), any(RowMapper.class), any(Object[].class))).thenAnswer(invocation -> {
+            @SuppressWarnings("unchecked") RowMapper<Object> mapper = invocation.getArgument(1);
+            ResultSet rs = mock(ResultSet.class);
+            when(rs.getLong("id")).thenReturn(88L);
+            when(rs.getLong("source_fee_id")).thenReturn(9001L);
+            when(rs.getInt("source_fee_version")).thenReturn(3);
+            when(rs.getLong("customer_id")).thenReturn(9L);
+            when(rs.getLong("order_id")).thenReturn(19L);
+            when(rs.getLong("inbound_id")).thenReturn(29L);
+            when(rs.getLong("container_id")).thenReturn(39L);
+            when(rs.getString("source_system")).thenReturn("FIRSTLEG");
+            when(rs.getString("source_type")).thenReturn("INBOUND_FEE");
+            when(rs.getString("source_no")).thenReturn("IN-9");
+            when(rs.getString("direction")).thenReturn("RECEIVABLE");
+            when(rs.getString("fee_item_name")).thenReturn("入库操作费");
+            when(rs.getString("currency_code")).thenReturn("CNY");
+            when(rs.getString("review_status")).thenReturn("APPROVED");
+            when(rs.getString("effective_status")).thenReturn("AVAILABLE");
+            when(rs.getString("source_snapshot")).thenReturn("{\"customerName\":\"客户9\",\"partnerId\":79,\"partnerName\":\"供应商A\",\"inboundCode\":\"IN-9\",\"containerNo\":\"CONT-9\",\"businessDate\":\"2026-08-11\",\"chargeableQuantity\":\"10\"}");
+            when(rs.getBigDecimal("amount")).thenReturn(new BigDecimal("120.00"));
+            when(rs.getBoolean("settlement_included")).thenReturn(true);
+            when(rs.getBoolean("statement_generated")).thenReturn(false);
+            return List.of(mapper.mapRow(rs, 0));
+        });
+        FinancePhase1OperationService service = new FinancePhase1OperationService(jdbc, objectMapper());
+
+        var result = service.listFinanceFeeSources(2, 50, 9L, "receivable", "available", "approved",
+            true, false, LocalDate.of(2026, 8, 1), LocalDate.of(2026, 8, 31), "IN-9");
+
+        assertThat(result.page()).satisfies(meta -> {
+            assertThat(meta.page()).isEqualTo(2);
+            assertThat(meta.pageSize()).isEqualTo(50);
+            assertThat(meta.total()).isEqualTo(1);
+        });
+        assertThat(result.data()).singleElement().satisfies(source -> {
+            assertThat(source.sourceSystem()).isEqualTo("FIRSTLEG");
+            assertThat(source.sourceBusinessId()).isEqualTo("IN-9");
+            assertThat(source.inboundCode()).isEqualTo("IN-9");
+            assertThat(source.containerNo()).isEqualTo("CONT-9");
+            assertThat(source.supplierName()).isEqualTo("供应商A");
+            assertThat(source.reviewStatus()).isEqualTo("APPROVED");
+            assertThat(source.businessDate()).isEqualTo(LocalDate.of(2026, 8, 11));
+            assertThat(source.settlementIncluded()).isTrue();
+            assertThat(source.statementGenerated()).isFalse();
+        });
+        verify(jdbc).query(startsWith("SELECT f.*"), any(RowMapper.class), any(Object[].class));
+    }
+
     @Test
     void ledgerReturnsStableBusinessTypeDocumentAndOperatorNameSnapshot() throws Exception {
         JdbcTemplate jdbc = mock(JdbcTemplate.class);
@@ -245,9 +302,12 @@ class FinancePhase1OperationBehaviorTest {
         when(rs.getLong("id")).thenReturn(88L);
         when(rs.getLong("source_fee_id")).thenReturn(700L);
         when(rs.getLong("customer_id")).thenReturn(9L);
+        when(rs.getLong("order_id")).thenReturn(90L);
         when(rs.getLong("inbound_id")).thenReturn(100L);
         when(rs.getLong("container_id")).thenReturn(200L);
         when(rs.getInt("source_fee_version")).thenReturn(3);
+        when(rs.getString("source_system")).thenReturn("FIRSTLEG");
+        when(rs.getString("source_no")).thenReturn("IN-100");
         when(rs.getString("source_type")).thenReturn("INBOUND_FEE");
         when(rs.getString("direction")).thenReturn("RECEIVABLE");
         when(rs.getString("fee_item_name")).thenReturn("头程运费");

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

@@ -73,20 +73,31 @@ class FinancePlatformListContractTest {
 
     @Test
     void financeDetailsKeepOperatorIdsAndExposeNameSnapshots() {
+        assertRecordFields(com.baiyue.finance.dto.FinanceReadModels.ReconciliationSummary.class,
+            "periodStart", "periodEnd", "lineCount", "sourceCount", "sourceAmount", "adjustmentAmount",
+            "lastReceiptAt", "submittedAt", "reviewedAt", "issuedAt");
         assertRecordFields(com.baiyue.finance.dto.FinanceReadModels.Statement.class,
             "createdBy", "createdByName", "updatedBy", "updatedByName");
         assertRecordFields(com.baiyue.finance.dto.FinanceReadModels.BillRevision.class,
             "createdBy", "createdByName");
         assertRecordFields(com.baiyue.finance.dto.ReconciliationStatementDtos.ReconciliationDetail.class,
             "createdBy", "createdByName", "updatedBy", "updatedByName");
+        assertRecordFields(com.baiyue.finance.dto.ReconciliationStatementDtos.ReconciliationLine.class,
+            "direction", "sourceType", "sourceNo", "orderId", "inboundCode", "containerNo",
+            "businessDate", "quantity", "unitPrice");
         assertRecordFields(com.baiyue.finance.dto.ReconciliationStatementDtos.PaymentHistory.class,
-            "createdBy", "createdByName");
+            "voucherFileIds", "createdBy", "createdByName");
         assertRecordFields(com.baiyue.finance.dto.ReconciliationStatementDtos.ReconciliationRevision.class,
             "operatorId", "operatorName");
         assertRecordFields(com.baiyue.finance.dto.FinanceSettlementDtos.SettlementTransaction.class,
             "createdBy", "createdByName");
         assertRecordFields(com.baiyue.finance.dto.FinanceSettlementDtos.SettlementRevision.class,
             "operatorId", "operatorName");
+        assertRecordFields(com.baiyue.finance.dto.FinanceSettlementDtos.SettlementSummary.class,
+            "reconciliationStatementNo", "feeItemSummary", "createdBy", "createdByName", "createdAt",
+            "updatedAt", "lastPaymentAt");
+        assertRecordFields(com.baiyue.finance.dto.FinanceSettlementDtos.SettlementLine.class,
+            "orderId", "orderNo", "inboundId", "inboundCode", "containerId", "containerNo");
     }
 
     private static void assertRecordFields(Class<?> type, String... names) {

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

@@ -20,10 +20,11 @@ class FinancePlatformOptionalCustomerQueryTest {
 
         service.feePool(null, null);
         service.statements(null, false);
+        service.reconciliationStatements(null);
         service.receivableSettlements(null, false);
         service.payableSettlements(null);
 
-        assertThat(jdbc.calls).hasSize(5).allSatisfy(call -> {
+        assertThat(jdbc.calls).hasSize(6).allSatisfy(call -> {
             assertThat(call.sql()).doesNotContain("customer_id=?", "tenant_id=?");
             assertThat(call.args()).isEmpty();
         });
@@ -36,10 +37,11 @@ class FinancePlatformOptionalCustomerQueryTest {
 
         service.feePool(31L, null);
         service.statements(31L, false);
+        service.reconciliationStatements(31L);
         service.receivableSettlements(31L, false);
         service.payableSettlements(31L);
 
-        assertThat(jdbc.calls).hasSize(5).allSatisfy(call -> {
+        assertThat(jdbc.calls).hasSize(6).allSatisfy(call -> {
             assertThat(call.sql()).containsAnyOf("customer_id=?", "tenant_id=?");
             assertThat(call.args()).containsExactly(31L);
         });
@@ -50,6 +52,7 @@ class FinancePlatformOptionalCustomerQueryTest {
         FinanceQueryService service = new FinanceQueryService(new RecordingJdbc(), new ObjectMapper());
 
         assertThatThrownBy(() -> service.statements(0L, false)).hasMessageContaining("客户范围无效");
+        assertThatThrownBy(() -> service.reconciliationStatements(0L)).hasMessageContaining("客户范围无效");
         assertThatThrownBy(() -> service.feePool(-1L, null)).hasMessageContaining("客户范围无效");
     }
 

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

@@ -76,7 +76,7 @@ class FinanceReadApiBehaviorTest {
         settlementController.payableSettlements(11L);
 
         verify(queryService).customerAccount(11L);
-        verify(queryService).statements(11L, false);
+        verify(queryService).reconciliationStatements(11L);
         verify(settlementService).listSettlements("RECEIVABLE", 11L);
         verify(settlementService).listSettlements("PAYABLE", 11L);
     }
@@ -93,10 +93,10 @@ class FinanceReadApiBehaviorTest {
         controller.statements(31L);
 
         verify(queryService).feePool(null, null);
-        verify(queryService).statements(null, false);
+        verify(queryService).reconciliationStatements(null);
         verify(settlementService).listSettlements("RECEIVABLE", null);
         verify(settlementService).listSettlements("PAYABLE", null);
-        verify(queryService).statements(31L, false);
+        verify(queryService).reconciliationStatements(31L);
     }
 
     @Test

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

@@ -102,10 +102,10 @@ class FinanceSettlementBehaviorTest {
         ArgumentCaptor<String> scopedSql = ArgumentCaptor.forClass(String.class);
         verify(jdbc).queryForList(allSql.capture(), eq("PAYABLE"));
         verify(jdbc).queryForList(scopedSql.capture(), eq("PAYABLE"), eq(10L));
-        assertThat(allSql.getValue()).contains("FROM fin_settlement WHERE direction=?")
-            .doesNotContain("FROM fin_bill", "FROM fin_cost", "tenant_id=?");
-        assertThat(scopedSql.getValue()).contains("FROM fin_settlement WHERE direction=?", "tenant_id=?")
-            .doesNotContain("FROM fin_bill", "FROM fin_cost");
+        assertThat(allSql.getValue()).contains("FROM fin_settlement s", "WHERE s.direction=?")
+            .doesNotContain("FROM fin_cost", "AND s.tenant_id=?");
+        assertThat(scopedSql.getValue()).contains("FROM fin_settlement s", "WHERE s.direction=?", "AND s.tenant_id=?")
+            .doesNotContain("FROM fin_cost");
     }
 
     @Test
@@ -232,7 +232,7 @@ class FinanceSettlementBehaviorTest {
         when(jdbc.queryForList(startsWith("SELECT id,tenant_id,direction"), eq(88L))).thenReturn(List.of(before));
         when(jdbc.queryForList(startsWith("SELECT request_hash"), eq(10L), eq(7L),
             eq("SETTLEMENT_PAYMENT_CREATE"), eq("pay-key"))).thenReturn(List.of());
-        when(jdbc.queryForList(startsWith("SELECT id,tenant_id,settlement_no"), eq(88L))).thenReturn(List.of(after));
+        when(jdbc.queryForList(startsWith("SELECT s.id,s.tenant_id,s.settlement_no"), eq(88L))).thenReturn(List.of(after));
         when(jdbc.queryForList(startsWith("SELECT f.id fee_source_id"), eq(10L), eq(88L))).thenReturn(List.of());
         when(jdbc.queryForList(startsWith("SELECT id,transaction_type"), eq(10L), eq(88L))).thenReturn(List.of(Map.ofEntries(
             Map.entry("id", 501L), Map.entry("transaction_type", "PAYMENT"),
@@ -355,7 +355,7 @@ class FinanceSettlementBehaviorTest {
     @Test
     void settlementDetailRejectsMissingResource() {
         JdbcTemplate jdbc = org.mockito.Mockito.mock(JdbcTemplate.class);
-        when(jdbc.queryForList(startsWith("SELECT id,tenant_id,settlement_no"), eq(999L))).thenReturn(List.of());
+        when(jdbc.queryForList(startsWith("SELECT s.id,s.tenant_id,s.settlement_no"), eq(999L))).thenReturn(List.of());
 
         assertCode(() -> service(jdbc, org.mockito.Mockito.mock(FinanceFileClient.class)).getSettlement(999L), "FIN_404");
     }
@@ -574,7 +574,7 @@ class FinanceSettlementBehaviorTest {
     }
 
     private static void stubSettlementDetail(JdbcTemplate jdbc, Map<String, Object> settlement) {
-        when(jdbc.queryForList(startsWith("SELECT id,tenant_id,settlement_no"), eq(88L))).thenReturn(List.of(settlement));
+        when(jdbc.queryForList(startsWith("SELECT s.id,s.tenant_id,s.settlement_no"), eq(88L))).thenReturn(List.of(settlement));
         long customerId = ((Number) settlement.get("tenant_id")).longValue();
         when(jdbc.queryForList(startsWith("SELECT f.id fee_source_id"), eq(customerId), eq(88L))).thenReturn(List.of());
         when(jdbc.queryForList(startsWith("SELECT id,transaction_type"), eq(customerId), eq(88L))).thenReturn(List.of());
@@ -594,24 +594,32 @@ class FinanceSettlementBehaviorTest {
 
     private static Map<String, Object> settlementRow(String direction, String status, BigDecimal paid,
                                                      BigDecimal outstanding, int version) {
-        return new java.util.HashMap<>(Map.ofEntries(
+        java.util.HashMap<String, Object> row = new java.util.HashMap<>(Map.ofEntries(
             Map.entry("id", 88L), Map.entry("tenant_id", 10L), Map.entry("settlement_no", "AP-20260811-001"),
             Map.entry("direction", direction), Map.entry("customer_name_snapshot", "客户10"),
             Map.entry("supplier_id", 20L), Map.entry("supplier_name_snapshot", "供应商20"),
-            Map.entry("business_period", "2026-08"), Map.entry("currency_code", "CNY"),
+            Map.entry("business_period", "2026-08"), Map.entry("fee_item_summary", "拖车费"),
+            Map.entry("currency_code", "CNY"),
             Map.entry("total_amount", paid.add(outstanding)), Map.entry("paid_amount", paid),
             Map.entry("outstanding_amount", outstanding), Map.entry("generated_date", Date.valueOf("2026-08-11")),
             Map.entry("due_date", Date.valueOf("2026-09-10")),
             Map.entry("payment_status", paid.signum() == 0 ? "UNPAID" : status), Map.entry("status", status),
-            Map.entry("version", version)));
+            Map.entry("created_by", 7L), Map.entry("created_by_name", "platform_admin"),
+            Map.entry("created_at", Timestamp.valueOf("2026-08-11 09:00:00")),
+            Map.entry("updated_at", Timestamp.valueOf("2026-08-11 09:00:00")), Map.entry("version", version)));
+        row.put("reconciliation_statement_id", null);
+        row.put("reconciliation_statement_no", null);
+        row.put("last_payment_at", null);
+        return row;
     }
 
     private static SettlementDetail detail(String direction, String status, BigDecimal paid,
                                            BigDecimal outstanding, int version) {
         return new SettlementDetail(new SettlementSummary(88L, "SET-88", direction, 10L, "客户10", 20L,
-            "供应商20", null, "2026-08", "CNY", paid.add(outstanding), paid, outstanding,
+            "供应商20", null, null, "2026-08", "拖车费", "CNY", paid.add(outstanding), paid, outstanding,
             LocalDate.of(2026, 8, 11), LocalDate.of(2026, 9, 10), paid.signum() == 0 ? "UNPAID" : status,
-            status, version), List.of(), List.of(), List.of());
+            status, 7L, "platform_admin", LocalDateTime.of(2026, 8, 11, 9, 0),
+            LocalDateTime.of(2026, 8, 11, 9, 0), null, version), List.of(), List.of(), List.of());
     }
 
     private static AuthenticatedUser user(Set<String> permissions) {

finance/src/test/java/com/baiyue/finance/service/FinanceExportProviderServiceTest.java

@@ -47,16 +47,18 @@ class FinanceExportProviderServiceTest {
         Statement summary = new Statement(501L, 10001L, "REC-501", "客户A", LocalDate.parse("2026-08-31"),
             null, new BigDecimal("300"), new BigDecimal("100"), new BigDecimal("200"), "CNY", "ISSUED", 3,
             7L, "创建人A", LocalDateTime.parse("2026-08-01T09:00:00"), 8L, "更新人B", LocalDateTime.parse("2026-08-20T11:00:00"));
-        ReconciliationLine line = new ReconciliationLine(601L, 81L, 2, "hash", 21L, 31L, "运费",
+        ReconciliationLine line = new ReconciliationLine(601L, 81L, 2, "hash", "RECEIVABLE", "CONTAINER_FEE",
+            "CONT-31", 11L, 21L, 31L, "IN-21", "CONT-31", LocalDate.parse("2026-08-15"), BigDecimal.TEN,
+            new BigDecimal("30"), "运费",
             new BigDecimal("320"), new BigDecimal("300"), "CNY", "优惠调整");
         ReconciliationDetail detail = new ReconciliationDetail(501L, "REC-501", 10001L, "客户A",
             LocalDate.parse("2026-08-01"), LocalDate.parse("2026-08-31"), 30, "CNY", new BigDecimal("300"),
             new BigDecimal("100"), new BigDecimal("200"), false, "ISSUED", 3, 7L, "创建人A",
             LocalDateTime.parse("2026-08-01T09:00:00"), 8L, "更新人B", LocalDateTime.parse("2026-08-20T11:00:00"),
             "八月账单", List.of(line), List.of(new PaymentHistory(701L, "RECEIPT", LocalDate.parse("2026-08-20"),
-            new BigDecimal("100"), "BANK_TRANSFER", "PAY-701", 9L, "财务员", LocalDateTime.parse("2026-08-20T10:00:00"), "")), List.of());
-        FeeSourceDetail source = new FeeSourceDetail(81L, "CONTAINER_FEE", 9001L, 2, "RECEIVABLE", 10001L,
-            "客户A", null, null, 21L, "IN-21", 31L, "CONT-31", LocalDate.parse("2026-08-15"), "运费",
+            new BigDecimal("100"), "BANK_TRANSFER", "PAY-701", List.of("9001"), 9L, "财务员", LocalDateTime.parse("2026-08-20T10:00:00"), "")), List.of());
+        FeeSourceDetail source = new FeeSourceDetail(81L, "FIRSTLEG", "CONTAINER_FEE", "CONT-31", 9001L, 2, "RECEIVABLE", 10001L,
+            "客户A", null, null, null, 21L, "IN-21", 31L, "CONT-31", LocalDate.parse("2026-08-15"), "运费",
             BigDecimal.TEN, new BigDecimal("30"), new BigDecimal("300"), "CNY", "APPROVED", true,
             "AVAILABLE", true, null, null, "hash", 2, List.of());
         when(queryService.statements(10001L, false)).thenReturn(List.of(summary));