diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js index eacde904..3bd9eb47 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/unwindSwapTrade.js @@ -280,8 +280,8 @@ const vue = new Vue({ let floatRatio = this.floatPosition.PayDirection == 1 ? 1 : -1; var postData = { startDate: thisObj.TradeStartDate, endDate: thisObj.deal.UnwindDate, underlyingCode: thisObj.floatPosition.UnderlyingCode, tradeId: thisObj.deal.SwapTradeId, unwindDate: thisObj.deal.UnwindDate } main.post("/BondPayment/GetBondPayMentInterest", postData, { async: false }).done(function (resp) { - let consumedDividend = parseFloat(resp.obj.consumedDividend ?? 0); - let consumedDividendInterest = -1 * consumedDividend / parseFloat(thisObj.deal.NotionalQty)//调整一下方向 + let consumedDividend = Math.Abs(parseFloat(resp.obj.consumedDividend ?? 0));//保持和totalInterest同向 + let consumedDividendInterest = consumedDividend / parseFloat(thisObj.deal.NotionalQty) // 这里计算已经分红的利息,从totalInterest里扣除 let totalDividend = parseFloat(thisObj.deal.CloseQty) * (resp.obj.totalInterest - consumedDividendInterest) * ratio * floatRatio; // 互换是全量消费,consumedDividend>0 表示分红已被当天互换消费,归0