|
@@ -117,6 +117,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
List<dynamic> hotelList = new List<dynamic>();
|
|
|
List<string> checkString = new List<string>();
|
|
|
|
|
|
+ //币种
|
|
|
+ var currArr = _sqlSugar.Queryable<Sys_SetData>().Where(x=>x.IsDel == 0 && x.STid == 66).ToList();
|
|
|
+
|
|
|
if (dac1.Count != 0)//酒店费用
|
|
|
{
|
|
|
for (int i = 0; i < dac1.Count; i++)
|
|
@@ -128,7 +131,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
var hotelData = new
|
|
|
{
|
|
|
CountryOrCity = dac1[i].Place,
|
|
|
- Price = dac1[i].SubTotal
|
|
|
+ Price = dac1[i].SubTotal,
|
|
|
+ CurrPrice = dac1[i].Cost,
|
|
|
+ CurrStr = (currArr.Find(x => x.Id == dac1[i].Currency)?.Remark ?? dac1[i].Currency.ToString()),
|
|
|
};
|
|
|
hotelList.Add(hotelData);
|
|
|
checkString.Add(dac1[i].Place);
|
|
@@ -147,6 +152,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{
|
|
|
CountryOrCity = city?.Country + city?.City,
|
|
|
Price = hotel.ToList()[0].SubTotal,
|
|
|
+ CurrPrice = hotel.ToList()[0].Cost,
|
|
|
+ CurrStr = (currArr.Find(x => x.Id == hotel.ToList()[0].Currency)?.Remark ?? hotel.ToList()[0].Currency.ToString()),
|
|
|
};
|
|
|
hotelList.Add(hotelData);
|
|
|
checkString.Add(city?.City ?? "");
|
|
@@ -165,7 +172,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
var mealsData = new
|
|
|
{
|
|
|
CountryOrCity = dac2[i].Place,
|
|
|
- Price = dac2[i].SubTotal
|
|
|
+ Price = dac2[i].SubTotal,
|
|
|
+ CurrPrice = dac1[i].Cost,
|
|
|
+ CurrStr = (currArr.Find(x => x.Id == dac1[i].Currency)?.Remark ?? dac1[i].Currency.ToString()),
|
|
|
};
|
|
|
|
|
|
MealsList.Add(mealsData);
|
|
@@ -183,6 +192,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{
|
|
|
CountryOrCity = city?.Country + city?.City,
|
|
|
Price = hotel.ToList()[0].SubTotal,
|
|
|
+ CurrPrice = hotel.ToList()[0].Cost,
|
|
|
+ CurrStr = (currArr.Find(x => x.Id == hotel.ToList()[0].Currency)?.Remark ?? hotel.ToList()[0].Currency.ToString()),
|
|
|
};
|
|
|
MealsList.Add(mealsData);
|
|
|
}
|