diff --git a/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看多】-【债券ETF】-清洁版.docx b/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看多】-【债券ETF】-清洁版.docx index 61f0b939..906a5d8f 100644 Binary files a/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看多】-【债券ETF】-清洁版.docx and b/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看多】-【债券ETF】-清洁版.docx differ diff --git a/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看多】-【现券】-清洁版.docx b/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看多】-【现券】-清洁版.docx index 6f29a29e..bf8e44c3 100644 Binary files a/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看多】-【现券】-清洁版.docx and b/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看多】-【现券】-清洁版.docx differ diff --git a/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看空】-【债券ETF】-清洁版.docx b/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看空】-【债券ETF】-清洁版.docx index b48ba6cf..a0f9962c 100644 Binary files a/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看空】-【债券ETF】-清洁版.docx and b/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看空】-【债券ETF】-清洁版.docx differ diff --git a/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看空】-【现券】-清洁版.docx b/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看空】-【现券】-清洁版.docx index 7b46d112..3b63631e 100644 Binary files a/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看空】-【现券】-清洁版.docx and b/Plugins/YLErp.Plugins.GuoLian/App_Docs/contract_template/国联民生-收益互换交易确认书-境内模板-【客户看空】-【现券】-清洁版.docx differ diff --git a/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeConfirmationGenerator.cs b/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeConfirmationGenerator.cs index 34ae5a7a..81aa0587 100644 --- a/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeConfirmationGenerator.cs +++ b/Plugins/YLErp.Plugins.GuoLian/DocumentGenerator/TradeConfirmationGenerator.cs @@ -207,7 +207,7 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator // 银行账户信息 dic["户名"] = bank?.ClientName ?? ""; dic["银行账号"] = bank?.Card ?? ""; - dic["支付系统号"] = ""; + dic["支付系统号"] = bank?.Payment ?? ""; dic["开户行"] = bank?.Bank ?? ""; dic["大额行号"] = bank?.Payment ?? ""; @@ -315,17 +315,17 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator // 区间0:当前净价 ≥ {100-(B-A)}% × 期初净价,追保0% dic["追保区间0下限"] = (100 - 1 * diff).ToString("0.##"); dic["追保金额比例0"] = "0"; - // 区间1:{100-2A}% ≤ 当前净价 < {100-A}%,追保{B-A}% - dic["追保区间1下限"] = (100 - 2 * maintainRatePercent).ToString("0.##"); - dic["追保区间1上限"] = (100 - 1 * maintainRatePercent).ToString("0.##"); + // 区间1:{100-2(B-A)}% ≤ 当前净价 < {100-(B-A)}%,追保{B-A}% + dic["追保区间1下限"] = (100 - 2 * diff).ToString("0.##"); + dic["追保区间1上限"] = (100 - 1 * diff).ToString("0.##"); dic["追保金额比例1"] = (1 * diff).ToString("0.##"); - // 区间2:{100-3A}% ≤ 当前净价 < {100-2A}%,追保{2(B-A)}% - dic["追保区间2下限"] = (100 - 3 * maintainRatePercent).ToString("0.##"); - dic["追保区间2上限"] = (100 - 2 * maintainRatePercent).ToString("0.##"); + // 区间2:{100-3(B-A)}% ≤ 当前净价 < {100-2(B-A)}%,追保{2(B-A)}% + dic["追保区间2下限"] = (100 - 3 * diff).ToString("0.##"); + dic["追保区间2上限"] = (100 - 2 * diff).ToString("0.##"); dic["追保金额比例2"] = (2 * diff).ToString("0.##"); - // 区间3:{100-4A}% ≤ 当前净价 < {100-3A}%,追保{3(B-A)}% - dic["追保区间3下限"] = (100 - 4 * maintainRatePercent).ToString("0.##"); - dic["追保区间3上限"] = (100 - 3 * maintainRatePercent).ToString("0.##"); + // 区间3:{100-4(B-A)}% ≤ 当前净价 < {100-3(B-A)}%,追保{3(B-A)}% + dic["追保区间3下限"] = (100 - 4 * diff).ToString("0.##"); + dic["追保区间3上限"] = (100 - 3 * diff).ToString("0.##"); dic["追保金额比例3"] = (3 * diff).ToString("0.##"); // === 客户看多 返还追保事件 === diff --git a/YLErpDAL/Modules/TradeModule/DocGenerateModule/GuolianContractNoGenerator.cs b/YLErpDAL/Modules/TradeModule/DocGenerateModule/GuolianContractNoGenerator.cs index fb20c420..4ca0b788 100644 --- a/YLErpDAL/Modules/TradeModule/DocGenerateModule/GuolianContractNoGenerator.cs +++ b/YLErpDAL/Modules/TradeModule/DocGenerateModule/GuolianContractNoGenerator.cs @@ -34,7 +34,7 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule var underlyingCode = (trade.UnderlyingCode ?? "").Replace(".", ""); // 去掉标的代码中的点号 var tradeDate = trade.TradeDate ?? DateTime.MinValue; var tradeDateStr = tradeDate.ToString("yyyyMMdd"); - var prefix = $"GLMS-{clientCode}-{tradeDateStr}-"; + var prefix = $"GLMS-{clientCode}-{tradeDateStr}-FICC-"; lock (_syncLock) {