|
@@ -1721,7 +1721,6 @@ namespace OASystem.API.Controllers
|
|
|
|
|
|
string priceMsg = $"<span style='font-weight:800;'>{touristGuideGroundReservations.PriceName}({touristGuideGroundReservations.ServiceStartTime} - {touristGuideGroundReservations.ServiceEndTime})</span><br/>";
|
|
|
|
|
|
-
|
|
|
foreach (var item in touristGuideGroundReservationsContents)
|
|
|
{
|
|
|
string typeName = "Unknown";
|
|
@@ -1738,6 +1737,10 @@ namespace OASystem.API.Controllers
|
|
|
carCurrencyName = currencyData.Remark;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ bool IsCurrencyAgreement = false;
|
|
|
+ if (carCurrencyCode.Equals(_groupCurrencyCode)) IsCurrencyAgreement = true;
|
|
|
+
|
|
|
string opCostStr = string.Empty;
|
|
|
decimal opCostTypePrice = 0.00M;
|
|
|
#region 处理成本各项费用
|
|
@@ -1780,12 +1783,16 @@ namespace OASystem.API.Controllers
|
|
|
|
|
|
}
|
|
|
opCostStr = $" / 成本:{opCostTypePrice.ToString("#0.00")} {_groupCurrencyCode}(汇率:{_groupRate.ToString("#0.0000")})";
|
|
|
+ if (IsCurrencyAgreement) opCostStr += $" ≈ {(opCostTypePrice * _groupRate).ToString("#0.00")} CNY";
|
|
|
}
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
+ string opTypeStr = $"{typeName}:{item.Price.ToString("#0.00")} {carCurrencyCode}(汇率:{entity.DayRate.ToString("#0.0000")})" ;
|
|
|
+ if (IsCurrencyAgreement) opTypeStr += $" ≈ {(item.Price * entity.DayRate).ToString("#0.00")} CNY";
|
|
|
+
|
|
|
priceMsg += $"日期:{item.DatePrice?.ToString("yyyy-MM-dd") ?? "-"}<br/>" +
|
|
|
- $"{typeName}:{item.Price.ToString("#0.00")} {carCurrencyCode}(汇率:{entity.DayRate.ToString("#0.0000")}) {opCostStr}<br/>" +
|
|
|
+ $"{opTypeStr} {opCostStr}<br/>" +
|
|
|
$"明细:{item.PriceContent ?? "-"}<br/>" +
|
|
|
$"备注:{item.Remark ?? "-"}<br/><br/>";
|
|
|
}
|