|
@@ -3668,27 +3668,27 @@ namespace OASystem.API.Controllers
|
|
|
//默认币种显示
|
|
|
List<CurrencyInfo> _currencyInfos = new List<CurrencyInfo>()
|
|
|
{
|
|
|
- new CurrencyInfo (){ CurrencyCode="USD",CurrencyName = "美元",Rate = 0.0000M },
|
|
|
- new CurrencyInfo (){ CurrencyCode="EUR",CurrencyName = "欧元",Rate = 0.0000M },
|
|
|
- new CurrencyInfo (){ CurrencyCode="GBP",CurrencyName = "英镑",Rate = 0.0000M },
|
|
|
- new CurrencyInfo (){ CurrencyCode="JPY",CurrencyName = "日元",Rate = 0.0000M },
|
|
|
- new CurrencyInfo (){ CurrencyCode="HKD",CurrencyName = "港币",Rate = 0.0000M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="USD",CurrencyName = "美元",Rate = 7.5000M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="EUR",CurrencyName = "欧元",Rate = 8.0000M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="GBP",CurrencyName = "英镑",Rate = 9.5000M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="JPY",CurrencyName = "日元",Rate = 0.0500M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="HKD",CurrencyName = "港币",Rate = 0.9500M },
|
|
|
|
|
|
};
|
|
|
|
|
|
- var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
|
|
|
- if (_currencyRate.Count > 0)
|
|
|
- {
|
|
|
+ //var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
|
|
|
+ //if (_currencyRate.Count > 0)
|
|
|
+ //{
|
|
|
|
|
|
- foreach (var item in _currencyInfos)
|
|
|
- {
|
|
|
- var rateInfo = _currencyRate.Where(it => it.Name.Equals(item.CurrencyName)).FirstOrDefault();
|
|
|
- if (rateInfo != null)
|
|
|
- {
|
|
|
- item.Rate = Convert.ToDecimal(rateInfo.FSellPri) / 100.00M;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ // foreach (var item in _currencyInfos)
|
|
|
+ // {
|
|
|
+ // var rateInfo = _currencyRate.Where(it => it.Name.Equals(item.CurrencyName)).FirstOrDefault();
|
|
|
+ // if (rateInfo != null)
|
|
|
+ // {
|
|
|
+ // item.Rate = Convert.ToDecimal(rateInfo.FSellPri) / 100.00M;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
|
|
|
|
|
|
return Ok(JsonView(true, "查询成功!", new
|
|
@@ -3723,33 +3723,33 @@ namespace OASystem.API.Controllers
|
|
|
//默认币种显示
|
|
|
List<CurrencyInfo> _currencyInfos = new List<CurrencyInfo>()
|
|
|
{
|
|
|
- new CurrencyInfo (){ CurrencyCode="USD",CurrencyName = "美元",Rate = 0.0000M },
|
|
|
- new CurrencyInfo (){ CurrencyCode="EUR",CurrencyName = "欧元",Rate = 0.0000M },
|
|
|
- new CurrencyInfo (){ CurrencyCode="GBP",CurrencyName = "英镑",Rate = 0.0000M },
|
|
|
- new CurrencyInfo (){ CurrencyCode="JPY",CurrencyName = "日元",Rate = 0.0000M },
|
|
|
- new CurrencyInfo (){ CurrencyCode="HKD",CurrencyName = "港币",Rate = 0.0000M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="USD",CurrencyName = "美元",Rate = 7.5000M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="EUR",CurrencyName = "欧元",Rate = 8.0000M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="GBP",CurrencyName = "英镑",Rate = 9.5000M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="JPY",CurrencyName = "日元",Rate = 0.0500M },
|
|
|
+ new CurrencyInfo (){ CurrencyCode="HKD",CurrencyName = "港币",Rate = 0.9500M },
|
|
|
};
|
|
|
|
|
|
- var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
|
|
|
- List<dynamic> reteInfos = new List<dynamic>();
|
|
|
- if (_currencyRate.Count > 0)
|
|
|
- {
|
|
|
- foreach (var item in _currencyInfos)
|
|
|
- {
|
|
|
- var rateInfo = _currencyRate.Where(it => it.Name.Equals(item.CurrencyName)).FirstOrDefault();
|
|
|
- if (rateInfo != null)
|
|
|
- {
|
|
|
- item.Rate = Convert.ToDecimal((Convert.ToDecimal(rateInfo.FSellPri == null ? 0.00M : rateInfo.FSellPri) / 100.00M).ToString("#0.0000"));
|
|
|
- reteInfos.Add(new
|
|
|
- {
|
|
|
- currCode = item.CurrencyCode,
|
|
|
- currName = item.CurrencyName,
|
|
|
- rate = item.Rate,
|
|
|
- lastUpdateDt = rateInfo.Date + " " + rateInfo.Time
|
|
|
- });
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+ //var _currencyRate = await _juHeApi.PostItemRateAsync(_currencyInfos.Select(it => it.CurrencyCode).ToArray());
|
|
|
+ //List<dynamic> reteInfos = new List<dynamic>();
|
|
|
+ //if (_currencyRate.Count > 0)
|
|
|
+ //{
|
|
|
+ // foreach (var item in _currencyInfos)
|
|
|
+ // {
|
|
|
+ // var rateInfo = _currencyRate.Where(it => it.Name.Equals(item.CurrencyName)).FirstOrDefault();
|
|
|
+ // if (rateInfo != null)
|
|
|
+ // {
|
|
|
+ // item.Rate = Convert.ToDecimal((Convert.ToDecimal(rateInfo.FSellPri == null ? 0.00M : rateInfo.FSellPri) / 100.00M).ToString("#0.0000"));
|
|
|
+ // reteInfos.Add(new
|
|
|
+ // {
|
|
|
+ // currCode = item.CurrencyCode,
|
|
|
+ // currName = item.CurrencyName,
|
|
|
+ // rate = item.Rate,
|
|
|
+ // lastUpdateDt = rateInfo.Date + " " + rateInfo.Time
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
|
|
|
var visaData = await _visaFeeInfoRep.EntryAndExitTips(dto.DiId);
|
|
|
var airData = await _ticketBlackCodeRep.EntryAndExitTips(dto.DiId);
|
|
@@ -3758,7 +3758,7 @@ namespace OASystem.API.Controllers
|
|
|
//GroupNameData = groupNameData.Data,
|
|
|
visaData = visaData.Data,
|
|
|
airData = airData.Data,
|
|
|
- reteInfos = reteInfos
|
|
|
+ reteInfos = _currencyInfos
|
|
|
}));
|
|
|
}
|
|
|
|