From e9467bb2d2b9c7e1ddfb785b2fce5b746babd4ee Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Fri, 17 May 2024 18:08:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/svc/order/svc_order_list.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/admin/svc/order/svc_order_list.go b/app/admin/svc/order/svc_order_list.go index 86f57c5..bb8b1c0 100644 --- a/app/admin/svc/order/svc_order_list.go +++ b/app/admin/svc/order/svc_order_list.go @@ -103,11 +103,11 @@ func OrderExport(c *gin.Context) { enterpriseName = enterpriseMap[v.EnterpriseId].Name inSideName = enterpriseMap[v.EnterpriseId].InsideName } - if data[utils.IntToStr(v.EnterpriseId)] == nil { - data[utils.IntToStr(v.EnterpriseId)] = make(map[int64][]map[string]string) + if data[enterpriseName] == nil { + data[enterpriseName] = make(map[int64][]map[string]string) } - if data[utils.IntToStr(v.EnterpriseId)][v.Oid] == nil { - data[utils.IntToStr(v.EnterpriseId)][v.Oid] = make([]map[string]string, 0) + if data[enterpriseName][v.Oid] == nil { + data[enterpriseName][v.Oid] = make([]map[string]string, 0) } //TODO:: 查找 `order_goods` var orderGoods []model.OrderGoods @@ -136,7 +136,7 @@ func OrderExport(c *gin.Context) { } tmp["sku_str"] = skuStr tmp["num"] = utils.IntToStr(vv.Num) - data[utils.IntToStr(v.EnterpriseId)][v.Oid] = append(data[utils.IntToStr(v.EnterpriseId)][v.Oid], tmp) + data[enterpriseName][v.Oid] = append(data[enterpriseName][v.Oid], tmp) } } } @@ -512,11 +512,11 @@ func OrderOutput(c *gin.Context) { enterpriseName = enterpriseMap[v.EnterpriseId].Name inSideName = enterpriseMap[v.EnterpriseId].InsideName } - if data[utils.IntToStr(v.EnterpriseId)] == nil { - data[utils.IntToStr(v.EnterpriseId)] = make(map[int64][]map[string]string) + if data[enterpriseName] == nil { + data[enterpriseName] = make(map[int64][]map[string]string) } - if data[utils.IntToStr(v.EnterpriseId)][v.Oid] == nil { - data[utils.IntToStr(v.EnterpriseId)][v.Oid] = make([]map[string]string, 0) + if data[enterpriseName][v.Oid] == nil { + data[enterpriseName][v.Oid] = make([]map[string]string, 0) } //TODO:: 查找 `order_goods` var orderGoods []model.OrderGoods @@ -545,7 +545,7 @@ func OrderOutput(c *gin.Context) { } tmp["sku_str"] = skuStr tmp["num"] = utils.IntToStr(vv.Num) - data[utils.IntToStr(v.EnterpriseId)][v.Oid] = append(data[utils.IntToStr(v.EnterpriseId)][v.Oid], tmp) + data[enterpriseName][v.Oid] = append(data[enterpriseName][v.Oid], tmp) } } }