fix(appointments): exclude pickup trips from delivery calendar

2026-10-19 12:21:57 +08:00
parent aa195cef66
commit fafcf75014
3 changed files with 11 additions and 3 deletions
@@ -11,16 +11,21 @@ import java.util.*;
 import static org.assertj.core.api.Assertions.*;

 class FleetTripCalendarMapperTest {
+    /** 同时验证计划和实发的半开范围，取货车次不能混入送仓日历。 */
    @Test void queriesAHalfOpenUtcWindowWithoutStatusFilteringAndCapsCandidateRows() throws Exception {
        var ds=new DriverManagerDataSource("jdbc:h2:mem:"+UUID.randomUUID()+";MODE=MySQL;DB_CLOSE_DELAY=-1","sa","");
        var jdbc=new JdbcTemplate(ds);
-        jdbc.execute("CREATE TABLE ll_fleet_trip(trip_no VARCHAR(64) PRIMARY KEY,status VARCHAR(32),warehouse_id BIGINT,warehouse_code VARCHAR(64),warehouse_name VARCHAR(100),planned_departure_at TIMESTAMP,expected_driver_end_at TIMESTAMP,departed_at TIMESTAMP,completed_at TIMESTAMP,stops_json VARCHAR(2000))");
+        jdbc.execute("CREATE TABLE ll_fleet_trip(trip_no VARCHAR(64) PRIMARY KEY,status VARCHAR(32),trip_purpose VARCHAR(32) DEFAULT 'DELIVERY',warehouse_id BIGINT,warehouse_code VARCHAR(64),warehouse_name VARCHAR(100),planned_departure_at TIMESTAMP,expected_driver_end_at TIMESTAMP,departed_at TIMESTAMP,completed_at TIMESTAMP,stops_json VARCHAR(2000))");
        var from=LocalDateTime.of(2026,11,1,0,0);var to=from.plusDays(1);
        String insert="INSERT INTO ll_fleet_trip(trip_no,status,warehouse_id,planned_departure_at,expected_driver_end_at,stops_json) VALUES(?,?,1,?,?, '[]')";
        jdbc.update(insert,"TR-BEFORE","PLANNED",from.minusSeconds(1),to);
        jdbc.update(insert,"TR-FROM","CANCELLED",from,to);
        jdbc.update(insert,"TR-LAST","COMPLETED",to.minusSeconds(1),to);
        jdbc.update(insert,"TR-TO","IN_TRANSIT",to,to.plusDays(1));
+        jdbc.update(insert,"TR-PICKUP-PLAN","PLANNED",from,to);
+        jdbc.update(insert,"TR-PICKUP-ACTUAL","IN_TRANSIT",from.minusDays(2),to);
+        jdbc.update("UPDATE ll_fleet_trip SET trip_purpose='PICKUP' WHERE trip_no LIKE 'TR-PICKUP-%'");
+        jdbc.update("UPDATE ll_fleet_trip SET departed_at=? WHERE trip_no='TR-PICKUP-ACTUAL'",from.plusHours(1));
        var config=new MybatisConfiguration();config.setMapUnderscoreToCamelCase(true);config.addMapper(FleetTripMapper.class);
        var factory=new MybatisSqlSessionFactoryBean();factory.setDataSource(ds);factory.setConfiguration(config);
        var mapper=new SqlSessionTemplate(factory.getObject()).getMapper(FleetTripMapper.class);