Merge branch 'jng' into dev

This commit is contained in:
桀尼龟 2025-07-03 16:02:28 +08:00
commit 07309ab587

View File

@ -649,9 +649,9 @@ func exportExcel(orderList []*bundle.OrderBundleRecordInfo) (*excelize.File, err
f.SetCellValue(sheetName, fmt.Sprintf("K%d", r), add.SettlementAmount)
f.SetCellValue(sheetName, fmt.Sprintf("L%d", r), GetCurrencyTypeText(add.CurrencyType))
f.SetCellValue(sheetName, fmt.Sprintf("M%d", r), add.HandlingFee)
f.SetCellValue(sheetName, fmt.Sprintf("N%d", r), add.ExchangeRate)
f.SetCellValue(sheetName, fmt.Sprintf("O%d", r), add.OrderAddCreateAt)
f.SetCellValue(sheetName, fmt.Sprintf("P%d", r), GetPayStatusText(add.AddPayStatus))
//f.SetCellValue(sheetName, fmt.Sprintf("N%d", r), add.ExchangeRate)
f.SetCellValue(sheetName, fmt.Sprintf("N%d", r), add.OrderAddCreateAt)
f.SetCellValue(sheetName, fmt.Sprintf("O%d", r), GetPayStatusText(add.AddPayStatus))
}
} else {
for i := 8; i <= 15; i++ {