liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导出订单增加字段

Browse Source
This commit is contained in:
苏尹岚
2020-04-29 15:32:52 +08:00
parent 21ddced471
commit 00285a58ba
1 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
business/jxcallback/orderman/orderman_ext.go
View File

@@ -331,34 +331,36 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
}
}
if v.SkuCount2 > 1 {
skuStr := strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2),
utils.Int2Str(v.SkuShopPrice),
utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(v.SkuEarningPrice),
}, ",")
price := 0
if v.SkuShopPrice < v.SkuSalePrice {
price = v.SkuShopPrice
} else {
price = v.SkuSalePrice
}
skuStr2 := strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2 - 1),
utils.Int2Str(v.SkuShopPrice),
utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(price),
}, ",")
if order == nil || v.ID != order.ID {
order = v
v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
v.Status2 = model.OrderStatusName[v.Status]
v.SkuInfo2 = skuStr + ";" + skuStr2
orders2 = append(orders2, v)
} else {
order.SkuInfo2 += ";" + skuStr + ";" + skuStr2
if v.SkuEarningPrice != 0 {
skuStr := strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2),
utils.Int2Str(v.SkuShopPrice),
utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(v.SkuEarningPrice),
}, ",")
price := 0
if v.SkuShopPrice < v.SkuSalePrice {
price = v.SkuShopPrice
} else {
price = v.SkuSalePrice
}
skuStr2 := strings.Join([]string{
utils.Int2Str(v.SkuID),
utils.Int2Str(v.SkuCount2 - 1),
utils.Int2Str(v.SkuShopPrice),
utils.Int2Str(v.SkuSalePrice),
utils.Int2Str(price),
}, ",")
if order == nil || v.ID != order.ID {
order = v
v.CourierVendorName = model.VendorChineseNames[v.WaybillVendorID]
v.Status2 = model.OrderStatusName[v.Status]
v.SkuInfo2 = skuStr + ";" + skuStr2
orders2 = append(orders2, v)
} else {
order.SkuInfo2 += ";" + skuStr + ";" + skuStr2
}
}
} else {
order.SkuInfo2 = ""
@@ -402,6 +404,7 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
"waybillFinishedAt",
"status2",
"skuInfo",
"skuInfo2",
"waybillTipMoney",
},
}