proto更新

api/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v4.24.0--rc1
+// - protoc             v3.20.3
 // source: pb/bundle.proto
 
 package bundle

pkg/service/bundle/bundleOrder.go

@@ -606,8 +606,8 @@ func exportExcel(orderList []*bundle.OrderBundleRecordInfo) (*excelize.File, err
 	f.SetSheetName("Sheet1", sheetName)
 
 	headers := []string{
-		"套餐订单号", "套餐", "套餐付款状态", "艺人手机号", "艺人", "套餐订单创建时间", "套餐金额",
-		"增值服务订单号", "增值税服务金额", "结算金额", "币种", "手续费", "汇率", "增值订单创建时间", "增值付款状态",
+		"套餐订单号", "套餐类型", "套餐付款状态", "艺人手机号", "艺人", "套餐订单创建时间", "套餐支付时间", "套餐金额",
+		"增值服务订单号", "增值税服务金额", "结算金额", "币种", "手续费", "增值订单创建时间", "增值付款状态",
 	}
 	for i, h := range headers {
 		cell := fmt.Sprintf("%s%d", string(rune('A'+i)), 1)
@@ -638,17 +638,18 @@ 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("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("N%d", r), add.OrderAddCreateAt)
 				f.SetCellValue(sheetName, fmt.Sprintf("O%d", r), GetPayStatusText(add.AddPayStatus))
 			}