From 7fac6e13a855fd83f2b3a918cf837cfb42b3d96e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8D=E9=94=90?= <1565842059@qq.com> Date: Fri, 17 Jul 2026 13:17:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(swaptrade):=20=E5=AE=9E=E7=8E=B0=E6=94=B6?= =?UTF-8?q?=E7=9B=8A=E7=BB=93=E7=AE=97=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=9C=9F=E6=9C=AB=E4=BB=B7=E6=A0=BC=E5=9B=9E=E6=98=BE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在incomeSwapTrade.js中修改TradingAmountAvg赋值逻辑，区分普通打开和审批打开场景 - 新增resolveIncomeTradingAmountAvg函数处理审批回显和普通默认值的不同逻辑 - 审批打开时保留已提交的期末全价，普通打开时使用期初全价作为默认值 - 统一债券价格×100缩放到界面百分比显示格式 - 添加单元测试验证审批回显和普通打开的功能差异 --- YLErpWeb/fe-tests/swapCalc.test.js | 11 +++++++++++ .../wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js | 10 +++++++--- YLErpWeb/wwwroot/Scripts/app/swaptrade/swapCalc.js | 9 +++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/YLErpWeb/fe-tests/swapCalc.test.js b/YLErpWeb/fe-tests/swapCalc.test.js index 25ff3deb..90dfe9c5 100644 --- a/YLErpWeb/fe-tests/swapCalc.test.js +++ b/YLErpWeb/fe-tests/swapCalc.test.js @@ -24,6 +24,17 @@ describe('回归守卫：曾出 bug 的纯函数', () => { expect(SwapCalc.deriveTradingAmountAvg(1.02, 100)).toBe(102); }); + test('收益结算审批回显提交的期末价格', () => { + expectClose( + SwapCalc.resolveIncomeTradingAmountAvg(0.98, 0.80, 100, true), + 80, + '债券审批应把已提交相对价0.80还原为界面值80'); + expectClose( + SwapCalc.resolveIncomeTradingAmountAvg(0.98, 0.80, 100, false), + 98, + '普通打开仍以期初全价98作为默认期末价'); + }); + // 3c5f25a5：FloatPnlSum 必须保留 2 位小数 test('calcFloatPnlSum 保留 2 位 (守卫 3c5f25a5)', () => { expectClose(SwapCalc.calcFloatPnlSum(100.456, 1, 0.5, 0), 101.96, '100.456+1+0.5=101.956→101.96'); diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js index 7afe1c9a..7acad7c4 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/incomeSwapTrade.js @@ -86,9 +86,13 @@ const vue = new Vue({ this.initPosiGrossPrice = this.floatPosition.PosiGrossPrice; // 互换标的价格固定为期初净价，与平仓不同不需要用户填写 // 期初净价入库为相对价(如1.02)，需转换为界面百分比形态(102)，与平仓页保持一致 - // 守卫: 期末全价必须用 PosiGrossPrice(全价) 且债券 ×100 转界面态 - // 对应历史 bug dcf649f2(错用净价) / 20ea93d8(×100 缩放丢失); 外置到 swapCalc.deriveTradingAmountAvg - this.floatPosition.TradingAmountAvg = SwapCalc.deriveTradingAmountAvg(this.initPosiGrossPrice, this.multiplier); + // 普通打开时用期初全价作为默认值；审批打开时必须保留已提交的期末全价，不能再被期初全价覆盖。 + // 两种来源入库时都是相对价，债券统一 ×100 还原为界面百分比态。 + this.floatPosition.TradingAmountAvg = SwapCalc.resolveIncomeTradingAmountAvg( + this.initPosiGrossPrice, + this.floatPosition.TradingAmountAvg, + this.multiplier, + isUseApproval); this.interestList = model.FlowEvents.filter((item) => { return item.InterestMode == 1 || item.InterestMode == 2 || item.InterestMode == 7 || item.InterestMode == 8 || item.InterestMode == 9; }); diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapCalc.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapCalc.js index 4e1c39c3..f18f520c 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapCalc.js +++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapCalc.js @@ -48,6 +48,14 @@ return posiGrossPrice * multiplier; } + // 普通打开时以期初全价作为期末价默认值；审批打开时回显已提交的期末相对价。 + function resolveIncomeTradingAmountAvg(posiGrossPrice, submittedTradingAmountAvg, multiplier, isUseApproval) { + var relativePrice = isUseApproval && submittedTradingAmountAvg !== undefined && submittedTradingAmountAvg !== null + ? submittedTradingAmountAvg + : posiGrossPrice; + return relativePrice * multiplier; + } + // 金额四舍五入到指定小数位（避免 0.1+0.2 类浮点误差） function roundMoney(value, digits) { return roundHalfAwayFromZero(value, digits); @@ -196,6 +204,7 @@ roundHalfAwayFromZero: roundHalfAwayFromZero, getPriceScale: getPriceScale, deriveTradingAmountAvg: deriveTradingAmountAvg, + resolveIncomeTradingAmountAvg: resolveIncomeTradingAmountAvg, roundMoney: roundMoney, calcFloatPnlSum: calcFloatPnlSum, calcStockEqvNotional: calcStockEqvNotional,