diff --git a/app/admin/models/order.go b/app/admin/models/order.go index cb57ae7..6a56e74 100644 --- a/app/admin/models/order.go +++ b/app/admin/models/order.go @@ -618,7 +618,7 @@ func OrderListExport(list []Order) (string, error) { fileName := time.Now().Format(TimeFormat) + "租赁订单" + ".xlsx" fmt.Println("url fileName:", url+fileName) - title := []interface{}{"租赁ID", "用户ID", "会员剩余时长", "取货方式", "状态", "取货码", "实付款", "下单时间", "租赁卡ID", "游戏卡ID", + title := []interface{}{"租赁ID", "用户ID", "会员剩余时长", "取货方式", "状态", "取货码", "实付款", "下单时间", "游戏卡ID", "游戏名称", "游戏卡状态"} cell, _ := excelize.CoordinatesToCellName(1, 1) if err = streamWriter.SetRow(cell, title); err != nil { @@ -675,10 +675,12 @@ func OrderListExport(list []Order) (string, error) { list[rowId].PickupCode, list[rowId].PayPrice, list[rowId].PayTime, - list[rowId].OrderCards[i].ID, + //list[rowId].OrderCards[i].ID, // 租赁卡ID不导出 list[rowId].OrderCards[i].GameCardId, list[rowId].OrderCards[i].GameName, - cardState} + cardState, + list[rowId].OrderCards[i].SerialNumber, + } cell, _ := excelize.CoordinatesToCellName(1, nExcelStartRow+2) if err := streamWriter.SetRow(cell, row); err != nil {