优化

lastleg-service/src/test/java/com/baiyue/lastleg/fleet/business/FleetPoolOrderBridgeTest.java

@@ -22,7 +22,7 @@ class FleetPoolOrderBridgeTest {
     LocalLooseboardHistoryMapper looseHistory=mock(LocalLooseboardHistoryMapper.class);
     UsTruckOrderMapper trucks=mock(UsTruckOrderMapper.class);
     UsTruckOrderStatusHistoryMapper truckHistory=mock(UsTruckOrderStatusHistoryMapper.class);
-    FleetPoolOrderNumberGenerator numbers=mock(FleetPoolOrderNumberGenerator.class);
+    com.baiyue.lastleg.service.LastlegDocumentNumberGenerator numbers=mock(com.baiyue.lastleg.service.LastlegDocumentNumberGenerator.class);
     FleetPoolDeliveryEvidence evidence=mock(FleetPoolDeliveryEvidence.class);
     com.baiyue.lastleg.appointmentplanning.AppointmentSourceLinker appointmentSources=mock(com.baiyue.lastleg.appointmentplanning.AppointmentSourceLinker.class);
     FleetLooseboardDemandRepository demands=mock(FleetLooseboardDemandRepository.class);
@@ -32,7 +32,7 @@ class FleetPoolOrderBridgeTest {
         service=new FleetPoolOrderBridge(new FleetPoolOrderRepository(links,loose,looseHistory,trucks,truckHistory),numbers,new ObjectMapper().findAndRegisterModules(),evidence,appointmentSources);
 
         org.springframework.test.util.ReflectionTestUtils.setField(service,"demands",demands);
-        when(numbers.next(anyString(),any(),anyLong())).thenReturn("LOCAL-001");
+        when(numbers.next(anyString())).thenReturn("LOCAL-001");
         when(links.lockBooking(7L)).thenAnswer(a->row);when(links.lockBookingNo("FB-7")).thenAnswer(a->row);
         when(links.lockIncoming("9","WT-7")).thenAnswer(a->row);
         when(links.lockDispatch("9","DISPATCH-7")).thenAnswer(a->row==null?List.of():List.of(row));
@@ -190,7 +190,10 @@ class FleetPoolOrderBridgeTest {
             assertThat(method.getAnnotation(Transactional.class).propagation()).isEqualTo(Propagation.MANDATORY);
         assertThat(Arrays.stream(FleetPoolOrderBridge.class.getDeclaredFields()).map(f->f.getType().getSimpleName()))
             .noneMatch(name->name.contains("FleetTrip")||name.contains("FleetBooking")||name.contains("Fee")||name.contains("Inventory"));
-        assertThat(Arrays.stream(FleetPoolOrderBridge.class.getDeclaredFields()).map(f->f.getType().getPackageName()))
+        assertThat(Arrays.stream(FleetPoolOrderBridge.class.getDeclaredFields())
+            // 只允许共享的编号基础能力；业务编排服务仍禁止反向依赖。
+            .filter(f -> f.getType() != com.baiyue.lastleg.service.LastlegDocumentNumberGenerator.class)
+            .map(f->f.getType().getPackageName()))
             .noneMatch(name->name.startsWith("com.baiyue.lastleg.delivery")||name.equals("com.baiyue.lastleg.fleet.trip")
                 ||name.equals("com.baiyue.lastleg.service"));
     }

lastleg-service/src/test/java/com/baiyue/lastleg/fleet/business/FleetPoolOrderNumberGeneratorTest.java

@@ -1,21 +0,0 @@
-package com.baiyue.lastleg.fleet.business;
-
-import org.junit.jupiter.api.Test;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import static org.assertj.core.api.Assertions.*;
-
-class FleetPoolOrderNumberGeneratorTest {
-    private final FleetPoolOrderNumberGenerator generator=new FleetPoolOrderNumberGenerator();
-    @Test void existingLooseboardAndTruckFormatLocationAndSuffixArePreserved(){
-        String day=LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-        assertThat(generator.next("LOOSEBOARD","FBA:ONT8",1234567)).isEqualTo("LB-ONT-"+day+"-234567");
-        assertThat(generator.next("TRUCK","nyc",1000001)).isEqualTo("TR-NYC-"+day+"-000001");
-    }
-    @Test void existingPrivateDestinationAndShortCodeRulesArePreserved(){
-        String day=LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);
-        assertThat(generator.next("TRUCK","private address",9)).isEqualTo("TR-WH-"+day+"-000009");
-        assertThat(generator.next("LOOSEBOARD","ab12",9)).isEqualTo("LB-AB12-"+day+"-000009");
-        assertThat(generator.next("TRUCK",null,-1)).isEqualTo("TR-WH-"+day+"-999999");
-    }
-}

lastleg-service/src/test/java/com/baiyue/lastleg/fleet/maintenance/VehicleCareAuthorizationTest.java

@@ -30,6 +30,10 @@ class VehicleCareAuthorizationTest {
     }
     private void authenticate(String code) { SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken("user", "unused", List.of(new SimpleGrantedAuthority(code)))); }
     @Configuration @EnableMethodSecurity static class Config {
+        /** 为控制器权限测试中的服务替身补齐编号依赖。 */
+        @Bean com.baiyue.lastleg.service.LastlegDocumentNumberGenerator documentNumbers() {
+            return com.baiyue.lastleg.service.TestDocumentNumbers.documents();
+        }
         @Bean VehicleCareService service() { return mock(VehicleCareService.class); }
         @Bean PlatformVehicleCareController controller(VehicleCareService service) { return new PlatformVehicleCareController(service); }
     }

lastleg-service/src/test/java/com/baiyue/lastleg/fleet/maintenance/VehicleCarePersistenceTest.java

@@ -51,6 +51,7 @@ class VehicleCarePersistenceTest {
         when(files.upload(anyLong(), anyString(), any())).thenReturn(new VehicleCareModels.File("9001", "photo.png", "image/png", 8));
         var target = new VehicleCareService(session.getMapper(VehicleCareMapper.class), session.getMapper(VehicleCareHistoryMapper.class), vehicles, files,
             new ObjectMapper().registerModule(new JavaTimeModule()), mock(VehicleCareFinanceService.class));
+        org.springframework.test.util.ReflectionTestUtils.setField(target, "documentNumbers", com.baiyue.lastleg.service.TestDocumentNumbers.documents());
         var proxy = new ProxyFactory(target); proxy.setProxyTargetClass(true);
         proxy.addAdvice(new TransactionInterceptor(new DataSourceTransactionManager(source), new AnnotationTransactionAttributeSource()));
         service = (VehicleCareService) proxy.getProxy();

lastleg-service/src/test/java/com/baiyue/lastleg/fleet/ownedbusiness/OwnedBusinessScopePersistenceTest.java

@@ -39,7 +39,7 @@ class OwnedBusinessScopePersistenceTest {
         baseline.setup();var reader=mock(DispatchDetailReader.class);
         when(reader.detail(any(),anyString())).thenAnswer(call->{
             var s=baseline.repository.source(call.getArgument(1));var r=baseline.codec.read(s.getResourcesJson(),DispatchContracts.Resources.class);
-            return new DispatchViews.Detail(s.getDispatchNo(),DispatchTypes.Status.ACTIVE,DispatchTypes.Stage.valueOf(s.getStage()),s.getRecordVersion(),
+            return new DispatchViews.Detail(s.getDispatchNo(),"DELIVERY",DispatchTypes.Status.ACTIVE,DispatchTypes.Stage.valueOf(s.getStage()),s.getRecordVersion(),
                 DispatchTypes.ReviewState.APPROVED,null,null,true,Map.of(),new DispatchViews.VehicleInfo(r.vehicle(),r.driver()),null,null,List.of());
         });
         queries=tx(new OwnedBusinessQueryService(baseline.repository,baseline.projection,baseline.codec,reader));

lastleg-service/src/test/java/com/baiyue/lastleg/fleet/trip/FleetCapacityOfferServiceTest.java

@@ -32,6 +32,7 @@ class FleetCapacityOfferServiceTest {
         SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken(user,"",List.of(new SimpleGrantedAuthority(FleetCapacityOfferService.LIST))));
         service=new FleetCapacityOfferService(offers,mock(FleetCapacityOfferCommandMapper.class),trips,mock(FleetBookingMapper.class),mock(FleetBookingService.class),reservations,
             execution,mock(FleetCustomerDirectory.class),mock(FleetPoolOrderBridge.class),new ObjectMapper().registerModule(new JavaTimeModule()),Clock.fixed(now,ZoneOffset.UTC));
+        org.springframework.test.util.ReflectionTestUtils.setField(service, "documentNumbers", com.baiyue.lastleg.service.TestDocumentNumbers.documents());
     }
     @AfterEach void clear(){SecurityContextHolder.clearContext();}
     @Test void ordinaryPageOnlyCalculatesRequestedDatabasePageAndPreservesAccurateTotal(){

lastleg-service/src/test/java/com/baiyue/lastleg/fleet/trip/FleetTripAuthorizationTest.java

@@ -112,6 +112,10 @@ class FleetTripAuthorizationTest {
     }
     @Configuration @EnableMethodSecurity
     static class Config {
+        /** 为控制器权限测试中的服务替身补齐编号依赖。 */
+        @Bean com.baiyue.lastleg.service.LastlegDocumentNumberGenerator documentNumbers() {
+            return com.baiyue.lastleg.service.TestDocumentNumbers.documents();
+        }
         /** 原单需求依赖使用替身，权限测试不访问数据库。 */
         @Bean com.baiyue.lastleg.fleet.business.FleetLooseboardDemandService looseboardDemands() { return mock(com.baiyue.lastleg.fleet.business.FleetLooseboardDemandService.class); }
         /** 桥接器的原单查询使用仓储替身。 */