fix: 支付宝账单过滤关闭的交易

This commit is contained in:
BaoXuebin 2022-07-26 22:09:27 +08:00
parent 2c9b83c907
commit 19862e8e71
1 changed files with 15 additions and 3 deletions

View File

@ -25,7 +25,7 @@ func ImportAliPayCSV(c *gin.Context) {
for { for {
lines, err := reader.Read() lines, err := reader.Read()
if err == io.EOF { if errors.Is(err, io.EOF) {
break break
} else if err != nil { } else if err != nil {
script.LogError(ledgerConfig.Mail, err.Error()) script.LogError(ledgerConfig.Mail, err.Error())
@ -36,6 +36,10 @@ func ImportAliPayCSV(c *gin.Context) {
script.LogInfo(ledgerConfig.Mail, err.Error()) script.LogInfo(ledgerConfig.Mail, err.Error())
continue continue
} }
if transaction.Account == "" {
script.LogInfo(ledgerConfig.Mail, "Invalid transaction")
continue
}
result = append(result, transaction) result = append(result, transaction)
} else if len(lines) == 12 { } else if len(lines) == 12 {
transaction, err := importMobileAliPayCSV(lines, currency, currencySymbol) transaction, err := importMobileAliPayCSV(lines, currency, currencySymbol)
@ -43,6 +47,10 @@ func ImportAliPayCSV(c *gin.Context) {
script.LogInfo(ledgerConfig.Mail, err.Error()) script.LogInfo(ledgerConfig.Mail, err.Error())
continue continue
} }
if transaction.Account == "" {
script.LogInfo(ledgerConfig.Mail, "Invalid transaction")
continue
}
result = append(result, transaction) result = append(result, transaction)
} }
} }
@ -54,7 +62,9 @@ func importBrowserAliPayCSV(lines []string, currency string, currencySymbol stri
dateColumn := strings.Fields(lines[2]) dateColumn := strings.Fields(lines[2])
status := strings.Trim(lines[15], " ") status := strings.Trim(lines[15], " ")
account := "" account := ""
if status == "已收入" { if status == "" {
account = ""
} else if status == "已收入" {
account = "Income:" account = "Income:"
} else { } else {
account = "Expenses:" account = "Expenses:"
@ -79,7 +89,9 @@ func importMobileAliPayCSV(lines []string, currency string, currencySymbol strin
dateColumn := strings.Fields(lines[10]) dateColumn := strings.Fields(lines[10])
status := strings.Trim(lines[0], " ") status := strings.Trim(lines[0], " ")
account := "" account := ""
if status == "支出" { if status == "" {
account = ""
} else if status == "支出" {
account = "Expenses:" account = "Expenses:"
} else { } else {
account = "Income:" account = "Income:"