fix: 交易日历IB逻辑收窄——仅成交日期默认值使用银行间日历
- 回退 ylotc.calendar.js 至纯CHN,恢复全部日期选择器为证券交易所交易日历 - SwapTrade2Controller 新增 GetBestCountry 按年份判断IB数据是否存在 - 仅成交日期(TradeDate)默认值使用IB优先/CHN回退,开始日期和到期日期保持CHN - 平仓及其他交易页面日期选择器不再受银行间日历影响
This commit is contained in:
@@ -67,7 +67,7 @@ namespace YLErp.Web.Controllers
|
||||
{
|
||||
TradeType = "收益互换",
|
||||
UnderlyingInstrumentType = "Stock",
|
||||
StartDate = QdpCalendarHelper.GetNonHoliday(valuedateBLL.ValueDate, tradeDateCountry),
|
||||
StartDate = QdpCalendarHelper.GetNonHoliday(valuedateBLL.ValueDate),
|
||||
TradeDate = QdpCalendarHelper.GetNonHolidayDefore(valuedateBLL.ValueDate.AddDays(-1), tradeDateCountry),
|
||||
TraderId = CurUser.UserId,
|
||||
TraderName = CurUser.UserName,
|
||||
|
||||
@@ -13,7 +13,7 @@ ylotc.isHoliday = function (date) {
|
||||
return false;
|
||||
}
|
||||
var y = date.getFullYear().toString();
|
||||
var holidays = ylotc.calendar[y + "ib"] || ylotc.calendar[y];
|
||||
var holidays = ylotc.calendar[y];
|
||||
if (Array.isArray(holidays)) {
|
||||
var d = date.getDate();
|
||||
var m = date.getMonth() + 1;//js月份从0开始
|
||||
|
||||
Reference in New Issue
Block a user