|
|
@@ -5,6 +5,7 @@ using NPOI.SS.Formula.Functions;
|
|
|
using OASystem.API.OAMethodLib;
|
|
|
using OASystem.API.OAMethodLib.JuHeAPI;
|
|
|
using OASystem.Domain.AesEncryption;
|
|
|
+using OASystem.Domain.Common;
|
|
|
using OASystem.Domain.Dtos.Statistics;
|
|
|
using OASystem.Domain.Entities.Customer;
|
|
|
using OASystem.Domain.Entities.Financial;
|
|
|
@@ -867,12 +868,18 @@ ORDER BY
|
|
|
var currFlight = flights.Where(it => it.Id == item.AirId).FirstOrDefault();
|
|
|
if (currFlight != null)
|
|
|
{
|
|
|
- if (currFlight.CreateTime >= Convert.ToDateTime("2026-01-01 00:00:00"))
|
|
|
+ if (currFlight.AirTicketBasicInfos.Any() && currFlight.CreateTime >= GlobalConfig.AirTicketIntegrationDateTime)
|
|
|
{
|
|
|
item.FlightsCode = string.Join("、", currFlight.AirTicketBasicInfos.Select(x => x.FlightsCode).ToList());
|
|
|
item.FlightsCity = string.Join("/", currFlight.AirTicketBasicInfos.Select(x => x.FlightsCity).ToList());
|
|
|
item.FlightsDate = currFlight.AirTicketBasicInfos.FirstOrDefault()?.FlightsDate ?? "";
|
|
|
item.FlightsTime = currFlight.AirTicketBasicInfos.FirstOrDefault()?.FlightsTime ?? "";
|
|
|
+
|
|
|
+ // 退票金额处理 显示为负数
|
|
|
+ if (currFlight.RecordType == 1)
|
|
|
+ {
|
|
|
+ item.CNYPrice = -Math.Abs(item.CNYPrice);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|