Merge remote-tracking branch 'origin/glms/feature/1.4.2' into glms/feature/1.4.2

UnitTestProject/Modules/SwapModule/PrepaidPrincipalCloseTraceTest.cs

@@ -71,7 +71,8 @@ namespace YLErp.Modules.SwapModule
                 id = 1001, SwapTradeId = 1, PositionType = (int)PositionTypeFlag.Unknown,
                 InterestDirection = (int)SwapDirectionEnum.收取,
                 InterestMode = (int)InterestModeEnum.初始预付金,
-                InterestRateDefault = Rate, InterestPrincipalFix = PrepayFix,
+                // GetUnwindInterests 会用实时腿覆盖初始腿本金；部分平仓后这里应为剩余 60%。
+                InterestRateDefault = Rate, InterestPrincipalFix = PrepayRemaining,
                 PosiStartDate = Start, PosiMatuirityDate = new DateTime(2027, 7, 28),
                 IsInitial = true, Invalid = false, InterestType = (int)InterestTypeEnum.单利,
                 IsAnnualized = true, interest_rest_days = 1,

YLErpDAL/BLL/EodSettlement/RealtimePnlCalc.cs

@@ -745,7 +745,7 @@ namespace YLErp.BLL.Eod
         #region 新互换实时持仓私有方法
         private static void BondCalcApi(ClientPosition clientPosition)
         {
-            var resp = BondCalcHepler.BondCalc(clientPosition.security_id, clientPosition.deal_full_price_avg ?? 0, "DP");
+            var resp = BondCalcHepler.BondCalc(clientPosition.security_id, clientPosition.deal_full_price_avg * ConsGlobal.bondShowPriceMultiple ?? 0, "DP");
             if (resp != null)
             {
                 clientPosition.deal_yield_avg = resp.ytm * ConsGlobal.bondPriceMultiple;