|
@@ -103,11 +103,11 @@ func OrderExport(c *gin.Context) { |
|
|
enterpriseName = enterpriseMap[v.EnterpriseId].Name |
|
|
enterpriseName = enterpriseMap[v.EnterpriseId].Name |
|
|
inSideName = enterpriseMap[v.EnterpriseId].InsideName |
|
|
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` |
|
|
//TODO:: 查找 `order_goods` |
|
|
var orderGoods []model.OrderGoods |
|
|
var orderGoods []model.OrderGoods |
|
@@ -136,7 +136,7 @@ func OrderExport(c *gin.Context) { |
|
|
} |
|
|
} |
|
|
tmp["sku_str"] = skuStr |
|
|
tmp["sku_str"] = skuStr |
|
|
tmp["num"] = utils.IntToStr(vv.Num) |
|
|
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 |
|
|
enterpriseName = enterpriseMap[v.EnterpriseId].Name |
|
|
inSideName = enterpriseMap[v.EnterpriseId].InsideName |
|
|
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` |
|
|
//TODO:: 查找 `order_goods` |
|
|
var orderGoods []model.OrderGoods |
|
|
var orderGoods []model.OrderGoods |
|
@@ -545,7 +545,7 @@ func OrderOutput(c *gin.Context) { |
|
|
} |
|
|
} |
|
|
tmp["sku_str"] = skuStr |
|
|
tmp["sku_str"] = skuStr |
|
|
tmp["num"] = utils.IntToStr(vv.Num) |
|
|
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) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|