From a0afa6f17a5923c24d3b923e8375ff4514f02868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A1=80=E5=B0=BC=E9=BE=9F?= <365252428@qq.com> Date: Wed, 2 Jul 2025 15:33:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/service/bundle/bundleOrder.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/service/bundle/bundleOrder.go b/pkg/service/bundle/bundleOrder.go index 83a24c8..4e2f3a8 100644 --- a/pkg/service/bundle/bundleOrder.go +++ b/pkg/service/bundle/bundleOrder.go @@ -605,7 +605,7 @@ func exportExcel(orderList []*bundle.OrderBundleRecordInfo) (*excelize.File, err f.SetSheetName("Sheet1", sheetName) headers := []string{ - "套餐订单号", "套餐", "套餐付款状态", "艺人手机号", "艺人", "套餐订单创建时间", "套餐金额", + "套餐订单号", "套餐", "套餐付款状态", "艺人手机号", "艺人", "套餐订单创建时间", "套餐支付时间", "套餐金额", "增值服务订单号", "增值税服务金额", "结算金额", "币种", "手续费", "汇率", "增值订单创建时间", "增值付款状态", } for i, h := range headers { @@ -637,19 +637,20 @@ func exportExcel(orderList []*bundle.OrderBundleRecordInfo) (*excelize.File, err f.SetCellValue(sheetName, fmt.Sprintf("D%d", rowIndex), bundleInfo.TelNum) f.SetCellValue(sheetName, fmt.Sprintf("E%d", rowIndex), bundleInfo.CustomerName) f.SetCellValue(sheetName, fmt.Sprintf("F%d", rowIndex), bundleInfo.BundleCreateAt) - f.SetCellValue(sheetName, fmt.Sprintf("G%d", rowIndex), bundleInfo.Amount) + f.SetCellValue(sheetName, fmt.Sprintf("G%d", rowIndex), bundleInfo.PayTime) + f.SetCellValue(sheetName, fmt.Sprintf("H%d", rowIndex), bundleInfo.Amount) if addCount > 0 { for i, add := range bundleInfo.AddBundleInfo { r := rowIndex + i - f.SetCellValue(sheetName, fmt.Sprintf("H%d", r), add.OrderAddNo) - f.SetCellValue(sheetName, fmt.Sprintf("I%d", r), add.Amount) - f.SetCellValue(sheetName, fmt.Sprintf("J%d", r), add.SettlementAmount) - f.SetCellValue(sheetName, fmt.Sprintf("K%d", r), GetCurrencyTypeText(add.CurrencyType)) - f.SetCellValue(sheetName, fmt.Sprintf("L%d", r), add.HandlingFee) - f.SetCellValue(sheetName, fmt.Sprintf("M%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)) + f.SetCellValue(sheetName, fmt.Sprintf("I%d", r), add.OrderAddNo) + f.SetCellValue(sheetName, fmt.Sprintf("J%d", r), add.Amount) + 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)) } } else { for i := 8; i <= 15; i++ {