Finance
/
beancount-gs
mirror of https://github.com/BaoXuebin/beancount-gs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update add transaction support multi account currency

This commit is contained in:
BaoXuebin 2024-05-31 00:04:55 +08:00
parent 35a6ee3cfe
commit a068577d38
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
service/accounts.go
View File

@ -61,6 +61,7 @@ func QueryAllAccount(c *gin.Context) {
} }
// 多个货币处理 // 多个货币处理
multiCurrency := strings.Split(account.Currency, ",") multiCurrency := strings.Split(account.Currency, ",")
// 账户主货币
account.Currency = multiCurrency[0] account.Currency = multiCurrency[0]
account.Currencies = multiCurrencies(*ledgerConfig, multiCurrency, currencyMap) account.Currencies = multiCurrencies(*ledgerConfig, multiCurrency, currencyMap)

9
service/transactions.go
View File

@ -168,22 +168,21 @@ func saveTransaction(c *gin.Context, addTransactionForm AddTransactionForm, ledg
var autoBalance bool var autoBalance bool
for _, entry := range addTransactionForm.Entries { for _, entry := range addTransactionForm.Entries {
account := script.GetLedgerAccount(ledgerConfig.Id, entry.Account)
if entry.Account == ledgerConfig.OpeningBalances { if entry.Account == ledgerConfig.OpeningBalances {
autoBalance = false autoBalance = false
line += fmt.Sprintf("\r\n %s", entry.Account) line += fmt.Sprintf("\r\n %s", entry.Account)
} else { } else {
line += fmt.Sprintf("\r\n %s %s %s", entry.Account, entry.Number.Round(2).StringFixedBank(2), account.Currency) line += fmt.Sprintf("\r\n %s %s %s", entry.Account, entry.Number.Round(2).StringFixedBank(2), entry.Currency)
} }
zero := decimal.NewFromInt(0) zero := decimal.NewFromInt(0)
// 判断是否涉及多币种的转换 // 判断是否涉及多币种的转换
if account.Currency != ledgerConfig.OperatingCurrency && entry.Account != ledgerConfig.OpeningBalances { if entry.Currency != ledgerConfig.OperatingCurrency && entry.Account != ledgerConfig.OpeningBalances {
// 汇率值小于等于0，则不进行汇率转换 // 汇率值小于等于0，则不进行汇率转换
if entry.Price.LessThanOrEqual(zero) { if entry.Price.LessThanOrEqual(zero) {
continue continue
} }
currency, isCurrency := currencyMap[account.Currency] currency, isCurrency := currencyMap[entry.Currency]
currencyPrice := entry.Price currencyPrice := entry.Price
if currencyPrice.Equal(zero) { if currencyPrice.Equal(zero) {
currencyPrice, _ = decimal.NewFromString(currency.Price) currencyPrice, _ = decimal.NewFromString(currency.Price)
@ -204,7 +203,7 @@ func saveTransaction(c *gin.Context, addTransactionForm AddTransactionForm, ledg
line += fmt.Sprintf(" {%s %s}", currencyPrice, ledgerConfig.OperatingCurrency) line += fmt.Sprintf(" {%s %s}", currencyPrice, ledgerConfig.OperatingCurrency)
} }
priceLine := fmt.Sprintf("%s price %s %s %s", addTransactionForm.Date, account.Currency, entry.Price, ledgerConfig.OperatingCurrency) priceLine := fmt.Sprintf("%s price %s %s %s", addTransactionForm.Date, entry.Currency, entry.Price, ledgerConfig.OperatingCurrency)
err := script.AppendFileInNewLine(script.GetLedgerPriceFilePath(ledgerConfig.DataPath), priceLine) err := script.AppendFileInNewLine(script.GetLedgerPriceFilePath(ledgerConfig.DataPath), priceLine)
if err != nil { if err != nil {
if c != nil { if c != nil {