|
|
@@ -625,46 +625,46 @@ namespace OASystem.API.Controllers
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (string.IsNullOrEmpty(str))
|
|
|
- {
|
|
|
- List<string> _clientNames = new List<string>();
|
|
|
- foreach (var item in groupAirFeeViews)
|
|
|
- {
|
|
|
- Regex r = new Regex("[0-9]");
|
|
|
- string[] ClientName = r.Replace(item.ClientName, "|").Split('|');
|
|
|
-
|
|
|
- foreach (var C in ClientName)
|
|
|
- {
|
|
|
- if (!string.IsNullOrWhiteSpace(C) && !C.Trim().Contains("行程单"))
|
|
|
- {
|
|
|
- string C1 = C.Replace("Mr", "").Replace("MR", "").Replace("mR", "").Replace("mr", "").Replace("Ms", "").Replace("MS", "").Replace("mS", "").Replace("ms", "");
|
|
|
- C1 = C1.Replace(".", "").Trim();
|
|
|
- if (!_clientNames.Contains(C1))
|
|
|
- {
|
|
|
- _clientNames.Add(C1);
|
|
|
- }
|
|
|
+ //if (string.IsNullOrEmpty(str))
|
|
|
+ //{
|
|
|
+ // List<string> _clientNames = new List<string>();
|
|
|
+ // foreach (var item in groupAirFeeViews)
|
|
|
+ // {
|
|
|
+ // Regex r = new Regex("[0-9]");
|
|
|
+ // string[] ClientName = r.Replace(item.ClientName, "|").Split('|');
|
|
|
+
|
|
|
+ // foreach (var C in ClientName)
|
|
|
+ // {
|
|
|
+ // if (!string.IsNullOrWhiteSpace(C) && !C.Trim().Contains("行程单"))
|
|
|
+ // {
|
|
|
+ // string C1 = C.Replace("Mr", "").Replace("MR", "").Replace("mR", "").Replace("mr", "").Replace("Ms", "").Replace("MS", "").Replace("mS", "").Replace("ms", "");
|
|
|
+ // C1 = C1.Replace(".", "").Trim();
|
|
|
+ // if (!_clientNames.Contains(C1))
|
|
|
+ // {
|
|
|
+ // _clientNames.Add(C1);
|
|
|
+ // }
|
|
|
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
- int index = 1;
|
|
|
- foreach (var item in _clientNames)
|
|
|
- {
|
|
|
- decimal CountCost = 0.00M;
|
|
|
- foreach (var Air in groupAirFeeViews)
|
|
|
- {
|
|
|
- if (Air.ClientName.Trim().Contains(item))
|
|
|
- {
|
|
|
- CountCost += Convert.ToDecimal((Air.PayMoney * Air.DayRate).ToString(").00"));
|
|
|
- }
|
|
|
- }
|
|
|
- index++;
|
|
|
-
|
|
|
- str += $"{index}. {item} 出票价为: { CountCost.ToString("#0.00")}CNY;";
|
|
|
- }
|
|
|
+ // int index = 1;
|
|
|
+ // foreach (var item in _clientNames)
|
|
|
+ // {
|
|
|
+ // decimal CountCost = 0.00M;
|
|
|
+ // foreach (var Air in groupAirFeeViews)
|
|
|
+ // {
|
|
|
+ // if (Air.ClientName.Trim().Contains(item))
|
|
|
+ // {
|
|
|
+ // CountCost += Convert.ToDecimal((Air.PayMoney * Air.DayRate).ToString(").00"));
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ // index++;
|
|
|
+
|
|
|
+ // str += $"{index}. {item} 出票价为: { CountCost.ToString("#0.00")}CNY;";
|
|
|
+ // }
|
|
|
|
|
|
- }
|
|
|
+ //}
|
|
|
|
|
|
_geView.GroupAirFeeStr = $@"人民币总费用：{AirCNYTotalPrice.ToString("#0.00")} CNY\r\n{str}\r\n经济舱均价为：{JJCAveragePrice.ToString("#0.00")}CNY/人;公务舱均价为：{GWCAveragePrice.ToString("#0.00")}CNY/人;";
|
|
|
#endregion
|
leiy