|
|
@@ -243,6 +243,11 @@ namespace travelExport
|
|
|
//航班号
|
|
|
string flightcode = tabRow["Fliagtcode"].ToString();
|
|
|
|
|
|
+ if (isTrade)
|
|
|
+ {
|
|
|
+ trip += "\r\n";
|
|
|
+ }
|
|
|
+
|
|
|
trip += $"{start_Object.City}/{end_Object.City}\r\n";
|
|
|
|
|
|
if (!isTrade)
|
|
|
@@ -720,6 +725,11 @@ namespace travelExport
|
|
|
//航班号
|
|
|
string flightcode = tabRow["Fliagtcode"].ToString();
|
|
|
|
|
|
+ if (isTrade)
|
|
|
+ {
|
|
|
+ trip += "\r\n";
|
|
|
+ }
|
|
|
+
|
|
|
trip += $"{start_Object.City}/{end_Object.City}\r\n";
|
|
|
|
|
|
//--提前俩个小时
|
|
|
@@ -1056,9 +1066,9 @@ namespace travelExport
|
|
|
trip += "\r\n00:00 抵达酒店办理入住手续";
|
|
|
|
|
|
trip = trip + "\r\n"
|
|
|
- + " 酒店名称：" + h.HotelName + "\r\n"
|
|
|
- + " 酒店地址：" + h.HotelAddress + "\r\n"
|
|
|
- + " 酒店电话：" + h.HotelTel + " 酒店传真：" + (string.IsNullOrWhiteSpace(h.HotelFax) ? "-" : h.HotelFax);
|
|
|
+ + " 酒店名称：" + h.HotelName + "\r\n"
|
|
|
+ + " 酒店地址：" + h.HotelAddress + "\r\n"
|
|
|
+ + " 酒店电话：" + h.HotelTel + " 酒店传真：" + (string.IsNullOrWhiteSpace(h.HotelFax) ? "-" : h.HotelFax);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1417,7 +1427,7 @@ namespace travelExport
|
|
|
//日
|
|
|
int day = Convert.ToInt32(Info[1].Substring(2, 2));
|
|
|
|
|
|
- var time = new DateTime(2023, month, day); //
|
|
|
+ var time = new DateTime(DateTime.Now.Year, month, day); //
|
|
|
|
|
|
var isExist = Info.Contains("[中转]");
|
|
|
|
|
|
@@ -2006,10 +2016,10 @@ namespace travelExport
|
|
|
get
|
|
|
{
|
|
|
DateTime.TryParse(this.Date, out DateTime Data);
|
|
|
- if (this.Date.Contains("T16:"))
|
|
|
- {
|
|
|
- Data = Data.AddDays(1);
|
|
|
- }
|
|
|
+ //if (this.Date.Contains("T16:"))
|
|
|
+ //{
|
|
|
+ // Data = Data.AddDays(1);
|
|
|
+ //}
|
|
|
Regex rg = new Regex("[0-9]+");
|
|
|
var gwTimeHHMM = this.Time;
|
|
|
var gwTimeHHMMMatch = rg.Matches(gwTimeHHMM);
|
yuanrf