Skip to content

chore: 增加总持仓收益率显示 #549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2025
Merged

chore: 增加总持仓收益率显示 #549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/statusbar/Profit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,10 @@ export class ProfitStatusBar {
amount: number;
incomeTotal: number | string;
incomeToday: number | string;
heldBase: number | string;
incomeTotalCNY: number | string;
incomeTodayCNY: number | string;
heldBaseCNY: number | string;
percentTotal: string;
};
const stockInfo: StockInfoType[] = [];
Expand All @@ -128,13 +130,15 @@ export class ProfitStatusBar {
}
// const incomeTotal = amount * (Number(price).toFixed(2) - unitPrice.toFixed(2));
// const incomeToday = amount * (Number(price).toFixed(2) - Number(open).toFixed(2));
const heldBase = (heldPrice * heldAmount).toFixed(2);
const incomeTotal = (heldAmount * (Number(price) - heldPrice)).toFixed(2);
// fix #399，在昨日收盘价没有的时候使用今日开盘价
const incomeToday = (heldAmount * (Number(price) - Number(yestclose || open))).toFixed(2);
const percentTotal = ((Number(incomeTotal) / (heldPrice * heldAmount)) * 100).toFixed(2);

let incomeTodayCNY = '';
let incomeTotalCNY = '';
let heldBaseCNY = '';

const forex = forexList.find(({ filter }) => {
if (typeof filter === 'function') {
Expand All @@ -149,6 +153,7 @@ export class ProfitStatusBar {
// 按现汇卖出价计算
incomeTodayCNY = (forex.spotSellPrice * Number(incomeToday) / 100).toFixed(2);
incomeTotalCNY = (forex.spotSellPrice * Number(incomeTotal) / 100).toFixed(2);
heldBaseCNY = (forex.spotSellPrice * Number(heldBase) / 100).toFixed(2);
}
}

Expand All @@ -163,8 +168,10 @@ export class ProfitStatusBar {
amount: heldAmount,
incomeTotal,
incomeToday,
heldBase,
incomeTodayCNY,
incomeTotalCNY,
heldBaseCNY,
percentTotal,
};
stockInfo.push(tmp);
Expand All @@ -177,16 +184,20 @@ export class ProfitStatusBar {
const allIncomeTotal = stockInfo.reduce((prev, cur) => {
return prev + Number(cur.incomeTotalCNY ? cur.incomeTotalCNY : cur.incomeTotal);
}, 0);
const heldBaseTotal = stockInfo.reduce((prev, cur) => {
return prev + Number(cur.heldBaseCNY ? cur.heldBaseCNY : cur.heldBase);
}, 0);
const heldPercentTotal = ((allIncomeTotal / heldBaseTotal) * 100).toFixed(2);
// Use the year, month, and day variables as needed
this.stockBarItem.text = `${PREFIX} ${toFixed(allIncomeTotal)} | ${toFixed(allIncomeToday)}`;
// this.stockBarItem.color = fundProfit >= 0 ? this.riseColor : this.fallColor;
this.stockBarItem.tooltip =
`「股票收益统计」 ${date}\r\n \r\n` +
`「股票收益统计」 ${date} 总收益:${allIncomeTotal} (${heldPercentTotal}%)\r\n \r\n` +
stockInfo
.map((v) => {
return `${v.name} 总收益:${v.incomeTotal} ${v.incomeTotalCNY ? `(CNY: ${v.incomeTotalCNY})` : ''} (${v.percentTotal}%) 今天${
Number(v.incomeToday) > 0 ? '盈利' : '亏损'
}:${v.incomeToday} ${v.incomeTodayCNY ? `(CNY: ${v.incomeTodayCNY})` : ''} (${v.percent}%) \r\n`;
}:${v.incomeToday} ${v.incomeTodayCNY ? `(CNY: ${v.incomeTodayCNY})` : ''} (${v.percent}%) `;
})
.join('\r\n-----------------------------\r\n');
this.stockBarItem.show();
Expand Down