fix: include overlapping overnight FBA appointments in calendar

2026-10-10 12:40:35 +08:00
parent 6e1d90aafe
commit 721d92ac7b
3 changed files with 21 additions and 2 deletions
@@ -36,7 +36,7 @@ public class InboundFbaAppointmentService {
        if(from==null || to==null || !to.isAfter(from) || ChronoUnit.DAYS.between(from,to)>42) throw bad("日历查询范围必须为1至42天");
        var query=new LambdaQueryWrapper<InboundFbaAppointment>()
            .notIn(InboundFbaAppointment::getAppointmentStatus,List.of("CANCELLED","FAILED"))
-            .apply("COALESCE(appointment_at,planned_at,planned_date)>={0} AND COALESCE(appointment_at,planned_at,planned_date)<{1}",from.atStartOfDay(),to.atStartOfDay())
+            .apply("COALESCE(appointment_at,planned_at,planned_date)<{1} AND (COALESCE(appointment_at,planned_at,planned_date)>={0} OR CASE WHEN appointment_at IS NOT NULL THEN appointment_end_at WHEN planned_at IS NOT NULL THEN planned_end_at ELSE NULL END>{0})",from.atStartOfDay(),to.atStartOfDay())
            .orderByAsc(InboundFbaAppointment::getId);
        return responses(appointmentMapper.selectList(query));
    }