Merge remote-tracking branch 'dest/glms/feature/1.4.2' into feature/p132_74-risk-engine

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.##");
 
                         // === 客户看多 返还追保事件 ===

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)
             {