优化

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

@@ -7,6 +7,7 @@ import com.baiyue.finance.dto.FinancePhase1Dtos.FeeSourceDetail;
 import com.baiyue.finance.dto.FinancePhase1Dtos.PageEnvelope;
 import com.baiyue.finance.service.FinanceEventException;
 import com.baiyue.finance.service.FinancePhase1OperationService;
+import com.baiyue.finance.service.FinanceCustomerAccountService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -39,21 +40,22 @@ import static org.mockito.Mockito.when;
 @ExtendWith(MockitoExtension.class)
 class FinancePhase1OperationBehaviorTest {
     @Mock FinancePhase1OperationService operationService;
+    @Mock FinanceCustomerAccountService customerAccountService;
 
     @Test
     void controllerDelegatesFiveFrozenOperationsAndUsesAuthenticatedOperator() {
-        FinancePhase1OperationController controller = new FinancePhase1OperationController(operationService);
+        FinancePhase1OperationController controller = new FinancePhase1OperationController(operationService, customerAccountService);
         AuthenticatedUser user = new AuthenticatedUser(71L, null, null, null, "finance", "ADMIN", "WEB", Set.of());
         var review = new FinancePhase1Dtos.ReviewRequest("APPROVE", "核对无误", 0);
         var inclusion = new FinancePhase1Dtos.SettlementInclusionRequest(true, "进入本期结算", 1);
 
-        controller.listDerivedCustomerAccounts(1, 20, "柏悦", "ACTIVE");
+        controller.listDerivedCustomerAccounts(1, 20, "柏悦", "ACTIVE", 9L);
         controller.listDerivedCustomerAccountLedger(9L, 2, 50, "RECEIPT", LocalDate.of(2026, 8, 1), LocalDate.of(2026, 8, 31));
         controller.getFinanceFeeSource(88L);
         controller.reviewFinanceFeeSource(user, 88L, "review-key", review);
         controller.updateFeeSourceSettlementInclusion(user, 88L, "include-key", inclusion);
 
-        verify(operationService).listDerivedCustomerAccounts(1, 20, "柏悦", "ACTIVE");
+        verify(customerAccountService).list(1, 20, "柏悦", "ACTIVE", 9L);
         verify(operationService).listDerivedCustomerAccountLedger(eq(9L), eq(2), eq(50), eq("RECEIPT"), any(), any());
         verify(operationService).getFinanceFeeSource(88L);
         verify(operationService).reviewFinanceFeeSource(88L, 71L, "review-key", review);
@@ -93,6 +95,8 @@ class FinancePhase1OperationBehaviorTest {
         assertThat(result.page().total()).isEqualTo(1);
         assertThat(result.requestId()).isNotBlank();
         assertThat(result.traceId()).isNotBlank();
+        assertThat(jdbc.accountListSql).contains("p.customer_name_snapshot");
+        assertThat(jdbc.accountListSql).doesNotContain("CAST(c.customer_id AS CHAR)");
     }
 
     @Test
@@ -234,6 +238,7 @@ class FinancePhase1OperationBehaviorTest {
 
     private static final class AccountJdbc extends JdbcTemplate {
         private final List<Long> ledgerCustomerIds = new ArrayList<>();
+        private String accountListSql = "";
 
         @Override
         public <T> T queryForObject(String sql, Class<T> requiredType, Object... args) {
@@ -245,6 +250,7 @@ class FinancePhase1OperationBehaviorTest {
         @SuppressWarnings("unchecked")
         public <T> List<T> query(String sql, RowMapper<T> rowMapper, Object... args) {
             if (sql.startsWith("SELECT c.customer_id")) {
+                accountListSql = sql;
                 return (List<T>) List.of(new FinancePhase1Dtos.AccountSummary(
                     9L, "9", "客户9", null, null, new BigDecimal("100.00"),
                     new BigDecimal("20.00"), new BigDecimal("30.00"), BigDecimal.ZERO,