import transaction from wechat pay billing file
This commit is contained in:
MaysWind
@@ -6,6 +6,7 @@ import (
|
||||
"github.com/mayswind/ezbookkeeping/pkg/converters/default"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/converters/feidee"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/converters/fireflyIII"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/converters/wechat"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/errs"
|
||||
)
|
||||
|
||||
@@ -36,6 +37,8 @@ func GetTransactionDataImporter(fileType string) (base.TransactionDataImporter,
|
||||
return alipay.AlipayAppTransactionDataCsvImporter, nil
|
||||
} else if fileType == "alipay_web_csv" {
|
||||
return alipay.AlipayWebTransactionDataCsvImporter, nil
|
||||
} else if fileType == "wechat_pay_app_csv" {
|
||||
return wechat.WeChatPayTransactionDataCsvImporter, nil
|
||||
} else {
|
||||
return nil, errs.ErrImportFileTypeNotSupported
|
||||
}
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
package wechat
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
|
||||
"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/core"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/models"
|
||||
)
|
||||
|
||||
var wechatPayTransactionTypeNameMapping = map[models.TransactionType]string{
|
||||
models.TRANSACTION_TYPE_INCOME: "收入",
|
||||
models.TRANSACTION_TYPE_EXPENSE: "支出",
|
||||
models.TRANSACTION_TYPE_TRANSFER: "/",
|
||||
}
|
||||
|
||||
// wechatPayTransactionDataCsvImporter defines the structure of wechatPay csv importer for transaction data
|
||||
type wechatPayTransactionDataCsvImporter struct {
|
||||
fileHeaderLineBeginning string
|
||||
dataHeaderStartContentBeginning string
|
||||
}
|
||||
|
||||
// Initialize a webchat pay transaction data csv file importer singleton instance
|
||||
var (
|
||||
WeChatPayTransactionDataCsvImporter = &wechatPayTransactionDataCsvImporter{}
|
||||
)
|
||||
|
||||
// ParseImportedData returns the imported data by parsing the wechat pay transaction csv data
|
||||
func (c *wechatPayTransactionDataCsvImporter) ParseImportedData(ctx core.Context, user *models.User, data []byte, defaultTimezoneOffset int16, accountMap map[string]*models.Account, expenseCategoryMap map[string]*models.TransactionCategory, incomeCategoryMap map[string]*models.TransactionCategory, transferCategoryMap map[string]*models.TransactionCategory, tagMap map[string]*models.TransactionTag) (models.ImportedTransactionSlice, []*models.Account, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionCategory, []*models.TransactionTag, error) {
|
||||
reader := bytes.NewReader(data)
|
||||
transactionDataTable, err := createNewWeChatPayTransactionDataTable(ctx, reader)
|
||||
|
||||
if err != nil {
|
||||
return nil, nil, nil, nil, nil, nil, err
|
||||
}
|
||||
|
||||
dataTableImporter := datatable.CreateNewSimpleImporter(wechatPayTransactionTypeNameMapping)
|
||||
|
||||
return dataTableImporter.ParseImportedData(ctx, user, transactionDataTable, defaultTimezoneOffset, accountMap, expenseCategoryMap, incomeCategoryMap, transferCategoryMap, tagMap)
|
||||
}
|
||||
@@ -0,0 +1,375 @@
|
||||
package wechat
|
||||
|
||||
import (
|
||||
"encoding/csv"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
"github.com/mayswind/ezbookkeeping/pkg/converters/datatable"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/core"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/errs"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/locales"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/log"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/models"
|
||||
"github.com/mayswind/ezbookkeeping/pkg/utils"
|
||||
)
|
||||
|
||||
const wechatPayTransactionDataCsvFileHeader = "微信支付账单明细"
|
||||
const wechatPayTransactionDataCsvFileHeaderWithUtf8Bom = "\xEF\xBB\xBF" + wechatPayTransactionDataCsvFileHeader
|
||||
const wechatPayTransactionDataHeaderStartContentBeginning = "----------------------微信支付账单明细列表--------------------"
|
||||
|
||||
const wechatPayTransactionDataCategoryTransferToWeChatWallet = "零钱充值"
|
||||
const wechatPayTransactionDataCategoryTransferFromWeChatWallet = "零钱提现"
|
||||
|
||||
const wechatPayTransactionDataStatusRefundName = "退款"
|
||||
|
||||
var wechatPayTransactionSupportedColumns = map[datatable.TransactionDataTableColumn]any{
|
||||
datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME: true,
|
||||
datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE: true,
|
||||
datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY: true,
|
||||
datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME: true,
|
||||
datatable.TRANSACTION_DATA_TABLE_AMOUNT: true,
|
||||
datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME: true,
|
||||
datatable.TRANSACTION_DATA_TABLE_DESCRIPTION: true,
|
||||
}
|
||||
|
||||
// wechatPayTransactionDataTable defines the structure of wechatPay transaction plain text data table
|
||||
type wechatPayTransactionDataTable struct {
|
||||
allOriginalLines [][]string
|
||||
originalHeaderLineColumnNames []string
|
||||
originalTimeColumnIndex int
|
||||
originalCategoryColumnIndex int
|
||||
originalTargetNameColumnIndex int
|
||||
originalProductNameColumnIndex int
|
||||
originalTypeColumnIndex int
|
||||
originalAmountColumnIndex int
|
||||
originalRelatedAccountColumnIndex int
|
||||
originalStatusColumnIndex int
|
||||
originalDescriptionColumnIndex int
|
||||
}
|
||||
|
||||
// wechatPayTransactionDataRow defines the structure of wechatPay transaction plain text data row
|
||||
type wechatPayTransactionDataRow struct {
|
||||
dataTable *wechatPayTransactionDataTable
|
||||
isValid bool
|
||||
originalItems []string
|
||||
finalItems map[datatable.TransactionDataTableColumn]string
|
||||
}
|
||||
|
||||
// wechatPayTransactionDataRowIterator defines the structure of wechatPay transaction plain text data row iterator
|
||||
type wechatPayTransactionDataRowIterator struct {
|
||||
dataTable *wechatPayTransactionDataTable
|
||||
currentIndex int
|
||||
}
|
||||
|
||||
// HasColumn returns whether the transaction data table has specified column
|
||||
func (t *wechatPayTransactionDataTable) HasColumn(column datatable.TransactionDataTableColumn) bool {
|
||||
_, exists := wechatPayTransactionSupportedColumns[column]
|
||||
return exists
|
||||
}
|
||||
|
||||
// TransactionRowCount returns the total count of transaction data row
|
||||
func (t *wechatPayTransactionDataTable) TransactionRowCount() int {
|
||||
if len(t.allOriginalLines) < 1 {
|
||||
return 0
|
||||
}
|
||||
|
||||
return len(t.allOriginalLines) - 1
|
||||
}
|
||||
|
||||
// TransactionRowIterator returns the iterator of transaction data row
|
||||
func (t *wechatPayTransactionDataTable) TransactionRowIterator() datatable.TransactionDataRowIterator {
|
||||
return &wechatPayTransactionDataRowIterator{
|
||||
dataTable: t,
|
||||
currentIndex: 0,
|
||||
}
|
||||
}
|
||||
|
||||
// IsValid returns whether this row is valid data for importing
|
||||
func (r *wechatPayTransactionDataRow) IsValid() bool {
|
||||
return r.isValid
|
||||
}
|
||||
|
||||
// GetData returns the data in the specified column type
|
||||
func (r *wechatPayTransactionDataRow) GetData(column datatable.TransactionDataTableColumn) string {
|
||||
_, exists := wechatPayTransactionSupportedColumns[column]
|
||||
|
||||
if !exists {
|
||||
return ""
|
||||
}
|
||||
|
||||
return r.finalItems[column]
|
||||
}
|
||||
|
||||
// HasNext returns whether the iterator does not reach the end
|
||||
func (t *wechatPayTransactionDataRowIterator) HasNext() bool {
|
||||
return t.currentIndex+1 < len(t.dataTable.allOriginalLines)
|
||||
}
|
||||
|
||||
// Next returns the next imported data row
|
||||
func (t *wechatPayTransactionDataRowIterator) Next(ctx core.Context, user *models.User) (daraRow datatable.TransactionDataRow, err error) {
|
||||
if t.currentIndex+1 >= len(t.dataTable.allOriginalLines) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
t.currentIndex++
|
||||
|
||||
rowItems := t.dataTable.allOriginalLines[t.currentIndex]
|
||||
isValid := true
|
||||
|
||||
if t.dataTable.originalTypeColumnIndex >= 0 &&
|
||||
rowItems[t.dataTable.originalTypeColumnIndex] != wechatPayTransactionTypeNameMapping[models.TRANSACTION_TYPE_INCOME] &&
|
||||
rowItems[t.dataTable.originalTypeColumnIndex] != wechatPayTransactionTypeNameMapping[models.TRANSACTION_TYPE_EXPENSE] &&
|
||||
rowItems[t.dataTable.originalTypeColumnIndex] != wechatPayTransactionTypeNameMapping[models.TRANSACTION_TYPE_TRANSFER] {
|
||||
log.Warnf(ctx, "[wechat_pay_transaction_data_plain_text_data_table.Next] skip parsing transaction in row \"index:%d\", because type is \"%s\"", t.currentIndex, rowItems[t.dataTable.originalTypeColumnIndex])
|
||||
isValid = false
|
||||
}
|
||||
|
||||
var finalItems map[datatable.TransactionDataTableColumn]string
|
||||
var errMsg string
|
||||
|
||||
if isValid {
|
||||
finalItems, errMsg = t.dataTable.parseTransactionData(ctx, user, rowItems)
|
||||
|
||||
if finalItems == nil {
|
||||
log.Warnf(ctx, "[wechat_pay_transaction_data_plain_text_data_table.Next] skip parsing transaction in row \"index:%d\", because %s", t.currentIndex, errMsg)
|
||||
isValid = false
|
||||
}
|
||||
}
|
||||
|
||||
return &wechatPayTransactionDataRow{
|
||||
dataTable: t.dataTable,
|
||||
isValid: isValid,
|
||||
originalItems: rowItems,
|
||||
finalItems: finalItems,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (t *wechatPayTransactionDataTable) parseTransactionData(ctx core.Context, user *models.User, items []string) (map[datatable.TransactionDataTableColumn]string, string) {
|
||||
data := make(map[datatable.TransactionDataTableColumn]string, len(wechatPayTransactionSupportedColumns))
|
||||
|
||||
if t.originalTimeColumnIndex >= 0 && t.originalTimeColumnIndex < len(items) {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TIME] = items[t.originalTimeColumnIndex]
|
||||
}
|
||||
|
||||
if t.originalCategoryColumnIndex >= 0 && t.originalCategoryColumnIndex < len(items) {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] = items[t.originalCategoryColumnIndex]
|
||||
} else {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] = ""
|
||||
}
|
||||
|
||||
if t.originalAmountColumnIndex >= 0 && t.originalAmountColumnIndex < len(items) {
|
||||
amount, success := utils.ParseFirstConsecutiveNumber(items[t.originalAmountColumnIndex])
|
||||
|
||||
if success {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = amount
|
||||
} else {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = items[t.originalAmountColumnIndex]
|
||||
}
|
||||
}
|
||||
|
||||
if t.originalDescriptionColumnIndex >= 0 && t.originalDescriptionColumnIndex < len(items) && items[t.originalDescriptionColumnIndex] != "" && items[t.originalDescriptionColumnIndex] != "/" {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = items[t.originalDescriptionColumnIndex]
|
||||
} else if t.originalProductNameColumnIndex >= 0 && t.originalProductNameColumnIndex < len(items) && items[t.originalProductNameColumnIndex] != "" && items[t.originalProductNameColumnIndex] != "/" {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = items[t.originalProductNameColumnIndex]
|
||||
} else {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_DESCRIPTION] = ""
|
||||
}
|
||||
|
||||
relatedAccountName := ""
|
||||
|
||||
if t.originalRelatedAccountColumnIndex >= 0 && t.originalRelatedAccountColumnIndex < len(items) {
|
||||
relatedAccountName = items[t.originalRelatedAccountColumnIndex]
|
||||
}
|
||||
|
||||
statusName := ""
|
||||
|
||||
if t.originalStatusColumnIndex >= 0 && t.originalStatusColumnIndex < len(items) {
|
||||
statusName = items[t.originalStatusColumnIndex]
|
||||
}
|
||||
|
||||
locale := user.Language
|
||||
|
||||
if locale == "" {
|
||||
locale = ctx.GetClientLocale()
|
||||
}
|
||||
|
||||
localeTextItems := locales.GetLocaleTextItems(locale)
|
||||
|
||||
if t.originalTypeColumnIndex >= 0 && t.originalTypeColumnIndex < len(items) {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = items[t.originalTypeColumnIndex]
|
||||
|
||||
if items[t.originalTypeColumnIndex] == wechatPayTransactionTypeNameMapping[models.TRANSACTION_TYPE_INCOME] {
|
||||
if relatedAccountName == "" || relatedAccountName == "/" {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = localeTextItems.DataConverterTextItems.WeChatWallet
|
||||
data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = ""
|
||||
} else {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = relatedAccountName
|
||||
}
|
||||
} else if items[t.originalTypeColumnIndex] == wechatPayTransactionTypeNameMapping[models.TRANSACTION_TYPE_TRANSFER] {
|
||||
if data[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] == wechatPayTransactionDataCategoryTransferToWeChatWallet {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = relatedAccountName
|
||||
data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = localeTextItems.DataConverterTextItems.WeChatWallet
|
||||
} else if data[datatable.TRANSACTION_DATA_TABLE_SUB_CATEGORY] == wechatPayTransactionDataCategoryTransferFromWeChatWallet {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = localeTextItems.DataConverterTextItems.WeChatWallet
|
||||
data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = relatedAccountName
|
||||
} else {
|
||||
return nil, fmt.Sprintf("unkown transfer transaction category")
|
||||
}
|
||||
} else {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_ACCOUNT_NAME] = relatedAccountName
|
||||
data[datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME] = ""
|
||||
}
|
||||
}
|
||||
|
||||
if data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] == wechatPayTransactionTypeNameMapping[models.TRANSACTION_TYPE_INCOME] && statusName != "" {
|
||||
if strings.Index(statusName, wechatPayTransactionDataStatusRefundName) >= 0 {
|
||||
amount, err := utils.ParseAmount(data[datatable.TRANSACTION_DATA_TABLE_AMOUNT])
|
||||
|
||||
if err == nil {
|
||||
data[datatable.TRANSACTION_DATA_TABLE_TRANSACTION_TYPE] = wechatPayTransactionTypeNameMapping[models.TRANSACTION_TYPE_EXPENSE]
|
||||
data[datatable.TRANSACTION_DATA_TABLE_AMOUNT] = utils.FormatAmount(-amount)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return data, ""
|
||||
}
|
||||
|
||||
func createNewWeChatPayTransactionDataTable(ctx core.Context, reader io.Reader) (*wechatPayTransactionDataTable, error) {
|
||||
allOriginalLines, err := parseAllLinesFromWechatPayTransactionPlainText(ctx, reader)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(allOriginalLines) < 2 {
|
||||
log.Errorf(ctx, "[wechat_pay_transaction_data_plain_text_data_table.createNewwechatPayTransactionPlainTextDataTable] cannot parse import data, because data table row count is less 1")
|
||||
return nil, errs.ErrNotFoundTransactionDataInFile
|
||||
}
|
||||
|
||||
originalHeaderItems := allOriginalLines[0]
|
||||
originalHeaderItemMap := make(map[string]int)
|
||||
|
||||
for i := 0; i < len(originalHeaderItems); i++ {
|
||||
originalHeaderItemMap[originalHeaderItems[i]] = i
|
||||
}
|
||||
|
||||
timeColumnIdx, timeColumnExists := originalHeaderItemMap["交易时间"]
|
||||
categoryColumnIdx, categoryColumnExists := originalHeaderItemMap["交易类型"]
|
||||
targetNameColumnIdx, targetNameColumnExists := originalHeaderItemMap["交易对方"]
|
||||
productNameColumnIdx, productNameColumnExists := originalHeaderItemMap["商品"]
|
||||
typeColumnIdx, typeColumnExists := originalHeaderItemMap["收/支"]
|
||||
amountColumnIdx, amountColumnExists := originalHeaderItemMap["金额(元)"]
|
||||
relatedAccountColumnIdx, relatedAccountColumnExists := originalHeaderItemMap["支付方式"]
|
||||
statusColumnIdx, statusColumnExists := originalHeaderItemMap["当前状态"]
|
||||
descriptionColumnIdx, descriptionColumnExists := originalHeaderItemMap["备注"]
|
||||
|
||||
if !timeColumnExists || !amountColumnExists || !typeColumnExists || !statusColumnExists {
|
||||
log.Errorf(ctx, "[wechat_pay_transaction_data_plain_text_data_table.createNewwechatPayTransactionPlainTextDataTable] cannot parse wechat pay csv data, because missing essential columns in header row")
|
||||
return nil, errs.ErrMissingRequiredFieldInHeaderRow
|
||||
}
|
||||
|
||||
if !categoryColumnExists {
|
||||
categoryColumnIdx = -1
|
||||
}
|
||||
|
||||
if !targetNameColumnExists {
|
||||
targetNameColumnIdx = -1
|
||||
}
|
||||
|
||||
if !productNameColumnExists {
|
||||
productNameColumnIdx = -1
|
||||
}
|
||||
|
||||
if !relatedAccountColumnExists {
|
||||
relatedAccountColumnIdx = -1
|
||||
}
|
||||
|
||||
if !descriptionColumnExists {
|
||||
descriptionColumnIdx = -1
|
||||
}
|
||||
|
||||
return &wechatPayTransactionDataTable{
|
||||
allOriginalLines: allOriginalLines,
|
||||
originalHeaderLineColumnNames: originalHeaderItems,
|
||||
originalTimeColumnIndex: timeColumnIdx,
|
||||
originalCategoryColumnIndex: categoryColumnIdx,
|
||||
originalTargetNameColumnIndex: targetNameColumnIdx,
|
||||
originalProductNameColumnIndex: productNameColumnIdx,
|
||||
originalAmountColumnIndex: amountColumnIdx,
|
||||
originalTypeColumnIndex: typeColumnIdx,
|
||||
originalRelatedAccountColumnIndex: relatedAccountColumnIdx,
|
||||
originalStatusColumnIndex: statusColumnIdx,
|
||||
originalDescriptionColumnIndex: descriptionColumnIdx,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func parseAllLinesFromWechatPayTransactionPlainText(ctx core.Context, reader io.Reader) ([][]string, error) {
|
||||
csvReader := csv.NewReader(reader)
|
||||
csvReader.FieldsPerRecord = -1
|
||||
|
||||
allOriginalLines := make([][]string, 0)
|
||||
hasFileHeader := false
|
||||
foundContentBeforeDataHeaderLine := false
|
||||
|
||||
for {
|
||||
items, err := csvReader.Read()
|
||||
|
||||
if err == io.EOF {
|
||||
break
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
log.Errorf(ctx, "[wechat_pay_transaction_data_plain_text_data_table.parseAllLinesFromWechatPayTransactionPlainText] cannot parse wechat pay csv data, because %s", err.Error())
|
||||
return nil, errs.ErrInvalidCSVFile
|
||||
}
|
||||
|
||||
if !hasFileHeader {
|
||||
if len(items) <= 0 {
|
||||
continue
|
||||
} else if strings.Index(items[0], wechatPayTransactionDataCsvFileHeader) == 0 || strings.Index(items[0], wechatPayTransactionDataCsvFileHeaderWithUtf8Bom) == 0 {
|
||||
hasFileHeader = true
|
||||
continue
|
||||
} else {
|
||||
log.Warnf(ctx, "[wechat_pay_transaction_data_plain_text_data_table.parseAllLinesFromWechatPayTransactionPlainText] read unexpected line before read file header, line content is %s", strings.Join(items, ","))
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
if !foundContentBeforeDataHeaderLine {
|
||||
if len(items) <= 0 {
|
||||
continue
|
||||
} else if strings.Index(items[0], wechatPayTransactionDataHeaderStartContentBeginning) == 0 {
|
||||
foundContentBeforeDataHeaderLine = true
|
||||
continue
|
||||
} else {
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
if foundContentBeforeDataHeaderLine {
|
||||
if len(items) <= 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
for i := 0; i < len(items); i++ {
|
||||
items[i] = strings.Trim(items[i], " ")
|
||||
}
|
||||
|
||||
if len(allOriginalLines) > 0 && len(items) < len(allOriginalLines[0]) {
|
||||
log.Errorf(ctx, "[wechat_pay_transaction_data_plain_text_data_table.parseAllLinesFromWechatPayTransactionPlainText] cannot parse row \"index:%d\", because may missing some columns (column count %d in data row is less than header column count %d)", len(allOriginalLines), len(items), len(allOriginalLines[0]))
|
||||
return nil, errs.ErrFewerFieldsInDataRowThanInHeaderRow
|
||||
}
|
||||
|
||||
allOriginalLines = append(allOriginalLines, items)
|
||||
}
|
||||
}
|
||||
|
||||
if !hasFileHeader || !foundContentBeforeDataHeaderLine {
|
||||
return nil, errs.ErrInvalidFileHeader
|
||||
}
|
||||
|
||||
return allOriginalLines, nil
|
||||
}
|
||||
+2
-1
@@ -20,7 +20,8 @@ type DefaultTypes struct {
|
||||
|
||||
// DataConverterTextItems represents text items need to be translated in data converter
|
||||
type DataConverterTextItems struct {
|
||||
Alipay string
|
||||
Alipay string
|
||||
WeChatWallet string
|
||||
}
|
||||
|
||||
// VerifyEmailTextItems represents text items need to be translated in verify mail
|
||||
|
||||
+2
-1
@@ -10,7 +10,8 @@ var en = &LocaleTextItems{
|
||||
DigitGroupingSymbol: core.DIGIT_GROUPING_SYMBOL_COMMA,
|
||||
},
|
||||
DataConverterTextItems: &DataConverterTextItems{
|
||||
Alipay: "Alipay",
|
||||
Alipay: "Alipay",
|
||||
WeChatWallet: "Wallet",
|
||||
},
|
||||
VerifyEmailTextItems: &VerifyEmailTextItems{
|
||||
Title: "Verify Email",
|
||||
|
||||
@@ -10,7 +10,8 @@ var zhHans = &LocaleTextItems{
|
||||
DigitGroupingSymbol: core.DIGIT_GROUPING_SYMBOL_COMMA,
|
||||
},
|
||||
DataConverterTextItems: &DataConverterTextItems{
|
||||
Alipay: "支付宝",
|
||||
Alipay: "支付宝",
|
||||
WeChatWallet: "零钱",
|
||||
},
|
||||
VerifyEmailTextItems: &VerifyEmailTextItems{
|
||||
Title: "验证邮箱",
|
||||
|
||||
@@ -3,9 +3,14 @@ package utils
|
||||
import (
|
||||
"crypto/rand"
|
||||
"math/big"
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var (
|
||||
numberPattern = regexp.MustCompile("(-?\\d+)(\\.\\d+)?")
|
||||
)
|
||||
|
||||
// GetRandomInteger returns a random number, the max parameter represents upper limit
|
||||
func GetRandomInteger(max int) (int, error) {
|
||||
result, err := rand.Int(rand.Reader, big.NewInt(int64(max)))
|
||||
@@ -17,6 +22,17 @@ func GetRandomInteger(max int) (int, error) {
|
||||
return int(result.Int64()), nil
|
||||
}
|
||||
|
||||
// ParseFirstConsecutiveNumber returns the first consecutive number in the specified string
|
||||
func ParseFirstConsecutiveNumber(str string) (string, bool) {
|
||||
result := numberPattern.FindAllString(str, 1)
|
||||
|
||||
if len(result) > 0 {
|
||||
return result[0], true
|
||||
} else {
|
||||
return "", false
|
||||
}
|
||||
}
|
||||
|
||||
// TrimTrailingZerosInDecimal returns a textual number without trailing zeros in decimal
|
||||
func TrimTrailingZerosInDecimal(num string) string {
|
||||
if len(num) < 1 {
|
||||
|
||||
@@ -6,6 +6,36 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestParseFirstConsecutiveNumber(t *testing.T) {
|
||||
expectedValue := "￥123.45"
|
||||
actualValue, success := ParseFirstConsecutiveNumber(expectedValue)
|
||||
assert.True(t, success)
|
||||
assert.Equal(t, "123.45", actualValue)
|
||||
|
||||
expectedValue = "$-123.45"
|
||||
actualValue, success = ParseFirstConsecutiveNumber(expectedValue)
|
||||
assert.True(t, success)
|
||||
assert.Equal(t, "-123.45", actualValue)
|
||||
|
||||
expectedValue = "$0.12$123.45"
|
||||
actualValue, success = ParseFirstConsecutiveNumber(expectedValue)
|
||||
assert.True(t, success)
|
||||
assert.Equal(t, "0.12", actualValue)
|
||||
|
||||
expectedValue = "$.12"
|
||||
actualValue, success = ParseFirstConsecutiveNumber(expectedValue)
|
||||
assert.True(t, success)
|
||||
assert.Equal(t, "12", actualValue)
|
||||
|
||||
expectedValue = ""
|
||||
actualValue, success = ParseFirstConsecutiveNumber(expectedValue)
|
||||
assert.False(t, success)
|
||||
|
||||
expectedValue = "xff"
|
||||
actualValue, success = ParseFirstConsecutiveNumber(expectedValue)
|
||||
assert.False(t, success)
|
||||
}
|
||||
|
||||
func TestTrimTrailingZerosInDecimal(t *testing.T) {
|
||||
expectedValue := "123.45"
|
||||
actualValue := TrimTrailingZerosInDecimal("123.45000000000")
|
||||
|
||||
@@ -63,6 +63,15 @@ const supportedImportFileTypes = [
|
||||
supportMultiLanguages: 'zh-Hans',
|
||||
anchor: '如何获取支付宝网页版交易流水文件'
|
||||
}
|
||||
},
|
||||
{
|
||||
type: 'wechat_pay_app_csv',
|
||||
name: 'WeChat Pay Billing File',
|
||||
extensions: '.csv',
|
||||
document: {
|
||||
supportMultiLanguages: 'zh-Hans',
|
||||
anchor: '如何获取微信支付账单文件'
|
||||
}
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@@ -1522,6 +1522,7 @@
|
||||
"Feidee MyMoney (Web) Data Export File": "Feidee MyMoney (Web) Data Export File",
|
||||
"Alipay (App) Transaction Flow File": "Alipay (App) Transaction Flow File",
|
||||
"Alipay (Web) Transaction Flow File": "Alipay (Web) Transaction Flow File",
|
||||
"WeChat Pay Billing File": "WeChat Pay Billing File",
|
||||
"Data File": "Data File",
|
||||
"No data to import": "No data to import",
|
||||
"Cannot import invalid transactions": "Cannot import invalid transactions",
|
||||
|
||||
@@ -1522,6 +1522,7 @@
|
||||
"Feidee MyMoney (Web) Data Export File": "金蝶随手记 (Web版) 数据导出文件",
|
||||
"Alipay (App) Transaction Flow File": "支付宝 (App) 交易流水文件",
|
||||
"Alipay (Web) Transaction Flow File": "支付宝 (网页版) 交易流水文件",
|
||||
"WeChat Pay Billing File": "微信支付账单文件",
|
||||
"Data File": "数据文件",
|
||||
"No data to import": "没有可以导入的数据",
|
||||
"Cannot import invalid transactions": "不能导入无效的交易",
|
||||
|
||||
Reference in New Issue
Block a user